Update models
Update test and seed data
Update services and tests
Update controllers and views
Fix #35
Update Terms
Fix #37
Fix #36