Implement a scoring mechanism.
Merge branch 'robert'