Moved things from draw to load that should have been there in the first place