WIP search functionality
Merge pull request #1 from kristing81/searching

WIP search functionality