WIP: New search mechanism.