Added basic search

Approve this and then I can start branching instead of forking haha