Week 6 & 7 homework, sans working tests