Refactor: Controls are now Commands