Updated Calculation To Current Version

Calculation Now properly interfaces with the handlers.