Changed world gen to take in some params