refactoring router engine
as broken as it can be
still messing with the router
router, 99%
router done, everything else broken :-P