More Complete Calculator