Added our version of search (but it's not working right)