State2 -> Rename to State.  All tests pass