Changing implementation details.
Probably want to fold functions in calc.py into one.