Updated Classes

These are the updated classes with changes made and two files that test
saving and loading.