Added a calculator for some future things