Assignments view controller now looks like less ass
merge