Find modules rebase

this is a rebased update of my previous PR