Search

Resolves both items from Issue #6