Update calc.y

With all the appropriate output statements. I am beginning testing now