MADS: Implemented more save/load logic