Added a world object
Merged