Implemented search, closes #2