Continued work on calcScore() in client