About to add more of the search feature