Next iteration of implement Finder