further consolidation of globals into Classes