Initial Work on the Generator

You sure this should default to true?