Merging Week 3 up to Master.