Swapped in new calculator for old.  Moved points calculation to separate points calculators for each player type.