Week7

First pull request for week 7.