Added helper methods for calculating points.

Tests currently fail- need to fix.