Added "calculator"
-closes #3