Merge pull request #11 from abigezunt/fixmodel

Fixes models and passes all tests, all extraneous code commented out
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
about to pull
added back commented-out code