Huge Change to the State Controller

Hopefully and Probably you (the User) doesn't notice anyting, but under the hood a lot changed (I finally know what i'm doing)