StateManager changed, lots of debug prints, and more
Merged Conflicts