Working on adding search