Fixed up blueprints + router.