Added more to the controller setup and to the basic router.