Add first part of search functionality