WIP on wiring up the search functionality. <Ben>