Started adding search functionality