moved all world stuff into world class