Fixing persistent data stuff
Fix merge conflicts