Moved the World stuff into world.cpp