Refactor for easier state addition

This refactors the code to make it much easier to add a new state.

Have tested on dev (for CA/TX/MO and in Spanish/English [tho not every crosstab]) and it works, so good to go!