calculator final commit