FLUID-5180: state changes model based.

Rather than having the state changes trigger the model change, the model change now triggers the state change.