Adding a search - WIP