 
   createBillingInfoModal: ->
 
+    console.trace()
+
     paymentController = KD.getSingleton "paymentController"
 
     billingInfoModal = paymentController.createBillingInfoModal 'group', {}
+    billingInfoModal.showLoader()
 
-    paymentController.fetchBillingInfo 'group', (err, groupBillingInfo) ->
+    group = @getData()
 
-      if groupBillingInfo
-        billingInfoModal.setBillingInfo groupBillingInfo
+    group.fetchPaymentMethod (err, groupBillingMethod) ->
+
+      if groupBillingMethod
+        billingInfoModal.hideLoader()
+        billingInfoModal.setBillingInfo groupBillingMethod
 
       else
-        paymentController.fetchBillingInfo 'user', (err, personalBillingInfo) ->
 
-          if personalBillingInfo
-            { billing } = personalBillingInfo
+        KD.whoami().fetchPaymentMethods (err, personalBillingMethods) ->
+
+          billingInfoModal.hideLoader()
+
+          if personalBillingMethods
 
             useExistingModal = new KDModalView
               title: 'Would you like to link an existing payment method?'

                  style       : 'modal-cancel'
                  callback    : -> useExistingModal.destroy()

            billingMethodView = new BillingMethodView {}, billing
            useExistingModal.addSubView billingMethodView

            billingMethodView.on 'BillingEditRequested', ->
              billingInfoModal.setBillingInfo personalBillingInfo.billing
              useExistingModal.destroy()


    return billingInfoModal

  policyViewAdded: (pane, view) ->

  paymentViewAdded: (pane, view) ->

    paymentController = KD.getSingleton 'paymentController'

    group = @getData()

    group.fetchPaymentMethod (err, paymentMethod) ->
      return new KDNotificationView title: err.message  if err

      view.setBillingInfo paymentMethod  if paymentMethod

    @paymentView = view

