Implemented new Approach and Find operations
- Including unit tests