Finished Basic search functionality