Finish initial working search tree version