Started working on search function