improve-calc-function
got calc working, amazing!