Revert "Calculator"

This reverts commit 90ab0a3accd62753c83960a3dabd34b8c1ceaa74.
Revert "Revert "Calculator""

This reverts commit e206e96da0a6f9b36d89206b5d0fb8de45407e1f.