Week 1 mostly done