finished all the associated assignments with classes
Merge branch 'sadmicrowave'