Still setting up framework to manage world

Just a little more work in the World Manager, which might actually hold
little enough content that can be moved to main.