Week 8 work not fully finished