Week4

Pull request for the first half of week 4.