Re-doing world gen to be more efficient