Split search out into a separate thread. Made one test pass but another fail...