Started working on search functionality