updated models, spec.  exercise complete
updated merge conflicts