Committing Entity and World

Not tested to be functionally correct.
Merge branch 'master' of https://github.com/jsyang/gdw1