Week 5 Commit

All stuff for Week 5 ready to commit.