Merging week 1 work up to master. Week 1 branch is in CODE FREEZE.