First commit of search feature