Week2

Here's the branch for week 2 including everything up to the first code review.