Generation stuff finished
Merge pull request #11 from vcnickerson/Connor

Generation stuff finished