world.cpp refactoring

Will not compile.