diff --git a/src/main/edu/wisc/services/cbs/order/payment/MockOrderPaymentService.php b/src/main/edu/wisc/services/cbs/order/payment/MockOrderPaymentService.php
index da436a29650c1749c73a80f6b766516cbf45c98b..999bfa2990dbe4b28e8cc033b23017142da44573 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/MockOrderPaymentService.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/MockOrderPaymentService.php
@@ -32,7 +32,7 @@ class MockOrderPaymentService implements OrderPaymentService
     /**
      * {@inheritdoc}
      */
-    public function createOrderPayment(OrderPayment $payment)
+    public function createOrderPayment(OrderPayment $payment): OrderPaymentServiceResponse
     {
         return $this->response;
     }
diff --git a/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php b/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
index e76e09f7ba569a982ad3271634a2f6f4b3b2235e..6a345a8903d50ce5b4a075326c488b47a53e5c88 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php
@@ -11,7 +11,7 @@ use Money\Money;
 class OrderPayment extends MagentoOrder
 {
 
-    /** @var string */
+    /** @var float */
     private $orderNumber;
 
     /** @var string */
@@ -51,18 +51,18 @@ class OrderPayment extends MagentoOrder
     private $testMode;
 
     /**
-     * @return string
+     * @return float
      */
-    public function getOrderNumber()
+    public function getOrderNumber(): float
     {
         return $this->orderNumber;
     }
 
     /**
-     * @param string $orderNumber
+     * @param float $orderNumber
      * @return OrderPayment
      */
-    public function setOrderNumber($orderNumber)
+    public function setOrderNumber(float $orderNumber): OrderPayment
     {
         $this->orderNumber = $orderNumber;
         return $this;
@@ -71,7 +71,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getOrigSysDocumentRef()
+    public function getOrigSysDocumentRef(): string
     {
         return $this->origSysDocumentRef;
     }
@@ -80,7 +80,7 @@ class OrderPayment extends MagentoOrder
      * @param string $origSysDocumentRef
      * @return OrderPayment
      */
-    public function setOrigSysDocumentRef($origSysDocumentRef)
+    public function setOrigSysDocumentRef(string $origSysDocumentRef): OrderPayment
     {
         $this->origSysDocumentRef = $origSysDocumentRef;
         return $this;
@@ -89,7 +89,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getPaymentInfo()
+    public function getPaymentInfo(): string
     {
         return $this->paymentInfo;
     }
@@ -98,7 +98,7 @@ class OrderPayment extends MagentoOrder
      * @param string $paymentInfo
      * @return OrderPayment
      */
-    public function setPaymentInfo($paymentInfo)
+    public function setPaymentInfo(string $paymentInfo): OrderPayment
     {
         $this->paymentInfo = $paymentInfo;
         return $this;
@@ -107,7 +107,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getPaymentType()
+    public function getPaymentType(): string
     {
         return $this->paymentType;
     }
@@ -116,7 +116,7 @@ class OrderPayment extends MagentoOrder
      * @param string $paymentType
      * @return OrderPayment
      */
-    public function setPaymentType($paymentType)
+    public function setPaymentType(string $paymentType): OrderPayment
     {
         $this->paymentType = $paymentType;
         return $this;
@@ -125,7 +125,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getRegister()
+    public function getRegister(): string
     {
         return $this->register;
     }
@@ -134,7 +134,7 @@ class OrderPayment extends MagentoOrder
      * @param string $register
      * @return OrderPayment
      */
-    public function setRegister($register)
+    public function setRegister(string $register): OrderPayment
     {
         $this->register = $register;
         return $this;
@@ -143,16 +143,16 @@ class OrderPayment extends MagentoOrder
     /**
      * @return Money
      */
-    public function getRenderedAmount()
+    public function getRenderedAmount(): Money
     {
         return $this->renderedAmount;
     }
 
     /**
-     * @param Money
+     * @param Money $renderedAmount
      * @return OrderPayment
      */
-    public function setRenderedAmount($renderedAmount)
+    public function setRenderedAmount(Money $renderedAmount): OrderPayment
     {
         $this->renderedAmount = $renderedAmount;
         return $this;
@@ -161,7 +161,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return Money
      */
-    public function getSubtotal()
+    public function getSubtotal(): Money
     {
         return $this->subtotal;
     }
@@ -170,7 +170,7 @@ class OrderPayment extends MagentoOrder
      * @param Money $subtotal
      * @return OrderPayment
      */
-    public function setSubtotal($subtotal)
+    public function setSubtotal(Money $subtotal): OrderPayment
     {
         $this->subtotal = $subtotal;
         return $this;
@@ -179,7 +179,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return Money
      */
-    public function getTax()
+    public function getTax(): Money
     {
         return $this->tax;
     }
@@ -188,7 +188,7 @@ class OrderPayment extends MagentoOrder
      * @param Money $tax
      * @return OrderPayment
      */
-    public function setTax($tax)
+    public function setTax(Money $tax): OrderPayment
     {
         $this->tax = $tax;
         return $this;
@@ -197,7 +197,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return Money
      */
-    public function getTotal()
+    public function getTotal(): Money
     {
         return $this->total;
     }
@@ -206,7 +206,7 @@ class OrderPayment extends MagentoOrder
      * @param Money $total
      * @return OrderPayment
      */
-    public function setTotal($total)
+    public function setTotal(Money $total): OrderPayment
     {
         $this->total = $total;
         return $this;
@@ -215,7 +215,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getPaymentNotes()
+    public function getPaymentNotes(): string
     {
         return $this->paymentNotes;
     }
@@ -224,7 +224,7 @@ class OrderPayment extends MagentoOrder
      * @param string $paymentNotes
      * @return OrderPayment
      */
-    public function setPaymentNotes($paymentNotes)
+    public function setPaymentNotes(string $paymentNotes): OrderPayment
     {
         $this->paymentNotes = $paymentNotes;
         return $this;
@@ -233,7 +233,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getSalesRep()
+    public function getSalesRep(): string
     {
         return $this->salesRep;
     }
@@ -242,7 +242,7 @@ class OrderPayment extends MagentoOrder
      * @param string $salesRep
      * @return OrderPayment
      */
-    public function setSalesRep($salesRep)
+    public function setSalesRep(string $salesRep): OrderPayment
     {
         $this->salesRep = $salesRep;
         return $this;
@@ -251,7 +251,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getOrderSource()
+    public function getOrderSource(): string
     {
         return $this->orderSource;
     }
@@ -260,7 +260,7 @@ class OrderPayment extends MagentoOrder
      * @param string $orderSource
      * @return OrderPayment
      */
-    public function setOrderSource($orderSource)
+    public function setOrderSource(string $orderSource): OrderPayment
     {
         $this->orderSource = $orderSource;
         return $this;
@@ -269,7 +269,7 @@ class OrderPayment extends MagentoOrder
     /**
      * @return string
      */
-    public function getTestMode()
+    public function getTestMode(): string
     {
         return $this->testMode;
     }
@@ -278,7 +278,7 @@ class OrderPayment extends MagentoOrder
      * @param string $testMode
      * @return OrderPayment
      */
-    public function setTestMode($testMode)
+    public function setTestMode(string $testMode): OrderPayment
     {
         $this->testMode = $testMode;
         return $this;
diff --git a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentInputParametersMapper.php b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentInputParametersMapper.php
index af923e28d34a0d5ea42ce828d2e33db9496e48ec..ab99f434cb0b61f2df6eb868d8b9d61ad7782f44 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentInputParametersMapper.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentInputParametersMapper.php
@@ -21,15 +21,15 @@ class OrderPaymentInputParametersMapper
     public static function toInputParameters(OrderPayment $payment)
     {
         return (new InputParameters(
+            0.0,
             '',
             '',
             '',
             '',
-            '',
-            '',
-            '',
-            '',
-            '',
+            0.0,
+            0.0,
+            0.0,
+            0.0,
             '',
             '',
             '',
diff --git a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentService.php b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentService.php
index 9b3ad6aba61f32f5b3898990df187a34b04fe873..783bd7adcd6c6c0dc4930c6cee0c1f997d6f1633 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentService.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentService.php
@@ -13,6 +13,6 @@ interface OrderPaymentService extends Service
      * @param OrderPayment $payment
      * @return OrderPaymentServiceResponse
      */
-    public function createOrderPayment(OrderPayment $payment);
+    public function createOrderPayment(OrderPayment $payment): OrderPaymentServiceResponse;
 
 }
\ No newline at end of file
diff --git a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentServiceResponse.php b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentServiceResponse.php
index 8ad35bedffacefe05bcd28d7cfb5fffb0782dd1d..b943fa6fe248a782fa3a74926ff2e125a48be072 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentServiceResponse.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/OrderPaymentServiceResponse.php
@@ -44,7 +44,7 @@ class OrderPaymentServiceResponse extends AbstractServiceResponse
     /**
      * @return Money
      */
-    public function getChangeBack()
+    public function getChangeBack(): Money
     {
         return $this->changeBack;
     }
@@ -52,7 +52,7 @@ class OrderPaymentServiceResponse extends AbstractServiceResponse
     /**
      * @return Money
      */
-    public function getBalanceDue()
+    public function getBalanceDue(): Money
     {
         return $this->balanceDue;
     }
@@ -60,7 +60,7 @@ class OrderPaymentServiceResponse extends AbstractServiceResponse
     /**
      * @return \DateTime
      */
-    public function getPaidToDate()
+    public function getPaidToDate(): \DateTime
     {
         return $this->paidToDate;
     }
diff --git a/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php b/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php
index 8329d6a74afe36a07e0b0c397104ff1dd32e2101..61e43b639b2058eba4575ee7cf5b75ada6ffd8e7 100644
--- a/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php
+++ b/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php
@@ -53,7 +53,7 @@ class SoapOrderPaymentService implements OrderPaymentService, SoapService
     /**
      * {@inheritdoc}
      */
-    public function createOrderPayment(OrderPayment $payment)
+    public function createOrderPayment(OrderPayment $payment): OrderPaymentServiceResponse
     {
         /** @var OutputParameters */
         $outputParameters = $this->soapClient->PAYMENT_CREATE(