First pass at eliminating controllers. Not debugged.