Week 6 examples only, plus partial refactoring of Week 5.