Update #38
Update Terms
Add Terms views
Update view models
Update project