Almost completed the implementation based on proper Find modules
Working version before investigating other approaches.