First commit of not working Calc