More work on routing.