Integrated world support

Lots of code cleanup in now required!