Working on the router to make it more DI-friendly.