Search

Search, plus tests for search!