Basic Search Functionality completed