- Began refactoring for better global object tracking