Made many changes to router, getting there as well as autoloading.