Moved things out of global

GETTING THERE.