Routing / controller overhaul.