Fixing persistent data loading
Merge errors fixed with test1 working
Made elements serializable