Some work on Searchlocation, should almost be done