Resolves #3. Refactored the find using a shared custom finder in a trait
Removed the old code