Ported some more world gen code.