Week6 first half

Pull request for first half of week 6.