Got much of the search functionality up and working nicely