moved a bunch of worldy things to the world class