Continued work on scorekeeper-client