Implement Search
Refactor
Merge branch 'feature/search' into develop