Updates so that generator generates. WIP.