Lots of reorganization and futher implementation of worlds, but startup seems to hang now