adding in search capabilities - untested