Data is loading and saving correctly now