Adding the Load and Saving capabilites w/ some refactoring