Milestone 1: Calculations fully implemented

May not be correct.