weeks 1 through 3 updates
a bunch of changes