Started work on the search functionality