Start getting rid of global vars