Week 7 Merge 1

First part of work for Week 7. Let me know what you think.