Lots of Routing progress

Routing!