Small progress on expanding the champ scoring stuff. Compilation broken.