Started work on the pruning
Fixed merge conflicts
Fixed searches.