Revamped Controllers and Routing