Changes to MainClass and SaveManager