A bunch of changes to get the scorecard view working