Added search functionality, not working yet
Fixed merge conflict