updated Calculator

added basic functionality