Major revision. Finished basic generator.