Re-added Calculator Class