Continued work on router.  Will have to think of design to properly
separate tasks