Refactoring and more dynamic worlds
Merge pull request #2 from emilthidell/dev

Refactoring and more dynamic worlds