Updated Data Persistence in response to TA comments

Does this finally work?