Add class to watch controller state changes
to be used around issuing a command
use ControllerStateWatcher