Cleanup
Add searcher, clean up
Refactor and add statistics