#4, #5: Starting to rewrite World and Entity.