Keep score as part of #8.

Still missing some score scenarios.