Finished implementing search