The new Router class is working
Added comments and touched a few of the public methods