Moving crap around to work around initialization issue