Still attempting to wrangle globals