Midway commit
router re-write 80% done