* Started moving all of the global variables into a struct, to facilitate