added world.cpp, updated world.h