Update to generation process, going to redo the entire thing soon