Remove buttons pressed to change to command based, change getState() to actually...