Week 7/8 cleanup.
Week 9 final.
Week 10 Initial