Week 3 done, still optional tasks to do