End of Semester Changes

Bulk commits