Add unfinished search code