Increment 3

Here is the beginning of the next increment. We need to make the GUI
consistent, update the scoring formula, and bring the code up to Oracle
Specification.