State2 -> Add ability to automap Commands to States.  Expand Commands to include more actions.