Term 2 - Week 6

Here's the second pass of the assignment from last week. Blocking plus.
I changed a few bits, and left some stuff to fix after I get my feedback for this week.