Re-did my score tracking changes that got un-did by the merge.