Way less globals

Lets see if the commit comments appear here
Fixed.