Only the search change

ThreatByKing_Futility branch with only the search changed (second take on search).