Renamed CalculatedRPN to Calculated and added more functionality