First versions of all states, and choice state working