Started rewrite on router to split routing and controller resolving into 2 separate events.