A lot more work on the ContentSaveData class