New world representation.
Merge branch 'new-world-representation'