Week2

week 2 mid-week code review
By the way, this will fix your bug.