App calculator

We are upgrading this functionality.