WIP: Refactoring: Remove Globals