Ongoing refactoring work.
Renamed draw to world.