Scott, do you want those globals to be addressed as part of this PR? Or handle them later?