Initial hack up of search via FSM