Save/Load Changes

Changes added to support the save/load functionality in the labs.