Some work prepping new router for actual code.