Eliminate global variables
Eliminate globals
Whoops, missed a variable