Still issues with data integrity, commit before testing new approach