fix
Fixing merge conflicts
Fixed the persistent data stufffff
Working