Reintroduced the router and controller