Lots of changes to allow multiple routers and better documentation