Replaced most input with Controller class