Moved Temporal Calculations to a Calculator