Rip out the globals :D