Revert "Scores"

This reverts commit a3620659c80fb034c93402ec0fd1032d1a6042af.
Revert "Revert "Scores""

This reverts commit ec9b7829eb58de932ecee748b4d5bb76faa0d478.