new search logic, entirely