World gen

Get the world gen stuff to be with everything else. Soon to be: world gen will mesh with GFX.