Intermediate Commit

(Still not functional) Added exceptions to calculate() methods