Add 1st version of calculator but need work