Initial commit
Merge origin/master
Set up some classes required for Section 2.