Bunch of routing stuff.  Unbreak build.
New forwarding mostly works...