Add ALL the states!

Issue #2818