I add the saveSystem class and add a few more cases in the switch statement in beginning class