refactored world
Merge pull request #1 from saltops/refactorworld

refactored world pt 3/3