Teach Andy to check state on a few more commands