[WIP] Migrate to GLOBALS to Container