More code towards intermediate points. Still 40 failing routing tests.