Refactor World and update tests. All passing.