Refactoring, beginnings of search.