Pull request for updated repository and skeleton code for generation

Includes recent changes, and skeleton code for generation.  Skeleton code is just class shells, with no actual code in the methods.