WIP of new search interface