initial version of the search, need to refactor
refactor search
Merge branch 'feature/search' into develop