Fixes models and passes all tests, all extraneous code commented out