test6 in progress
merge
Fixed persistent data
Fixed all persist data stuff
Fix merge conflicts
fixed test6
merge
merge conflict