Revert "Revert "Calculator""

This reverts commit 3f76e930472134b1538132b2c673612e9aaacb76.