Creates api_searcher class -- major refactor
Fixes merge conflict