Week 2 tasks

With a little delay, but...