Continued work on the router package.