Renamed controller to handle everything (simplify.)