about to ahve a merge problem
merging, and improving search