-- partial commit, more work on game manager