wip - router based nav controller

Working on replacing our crappy nav controller with one that is router based.