Feature search

Merging current work on searching into master