Dev commit from 27.3.14. Much progress on World. Fun times.