Peter Varga

done, only searcher is not fully passing the test. it works however