complete week 1 rewrite.