Flattened first cut of controllers with Geoff