Some more work for day two of Scala.

Finishes exercise two, and starts on exercise three.