Merged with world gen & added debug ui