Moving start-search into core