Added classes for all the DataModel objects
Fixed current code to still use oldCharacter – preserves functioning