Merged commits, started making the world object
World structure (almost) complete