Makes progress on the new routing logic.