World setup again?

recommiting these things