Move around the searcher to the logic module.