Set up initial generator structure.
Fix merge conflict