Did some more work on the C++ searcher