Final Commit

This is the final commit. I had to comment out some code as there were
some errors. I think the gist of the model is clear.