WIP: Implement new search mechanism.