Deployment 1.6, completely rewrote calc.py