Initial search implementation. Does not work!
Search now works.
Merge branch 'Search' into development