Revamping statemanager to be uni-scene-al
accidentally merged with master, sorry