Week6 second half

Final pull request for week 6.