We need a way to differentiate between the two types of commands, perhaps a new state in the state controller?