Added loading and saving
Merge branch 'SaveLoadDates'
Refactoring'