A cleaner version of search.

Delete this?