Complete Controller overhaul down to one controller