New routes flow: WIP