Much more progress on search. Yay!