Added router.
Clean-up.