Model changes and Views
"Add tests, Minor view changes"