Major rework of scoring, tests pass now.