Began refactoring loading and unloading of objects
Continued refactoring