Work as of 2PM August 1

Mostly finished except for switching weeks.