Added functionality to calc
Merge branch 'TitusBranch' into Original
Merge branch 'Original' of https://github.com/beanmachine44/M2 into Original