Finishing adding in code to populated persistent data
Fix information on files
Fix conflict