Will be addressed in a later commit, reducing the use of the global variables in general.