Began reworking controller commands to be part of the state machine