Moved global variables to globals infrastructure.
More global variables moved to globals infrastructure.
Resolved global variable.
Moved global variables to globals infrastructure.
Moved global variables to globals infrastructure.