Added bare-bones search functionality - yay!