Updated to generate based on the genmodel. Stil a few problems to work
out though.
Changed the schema used to store the avro file.  Passes unit tests.