Initial Add of generator
Fixing merge conflicts