diff --git a/src/clj/auto_ap/graphql/checks.clj b/src/clj/auto_ap/graphql/checks.clj
index a3420f88..7ccf46cd 100644
--- a/src/clj/auto_ap/graphql/checks.clj
+++ b/src/clj/auto_ap/graphql/checks.clj
@@ -63,18 +63,18 @@
   (let [output-stream (ByteArrayOutputStream.)]
     (pdf/pdf
      [{:left-margin 25 :right-margin 0 :top-margin 0 :bottom-margin 0 :size :letter}
-      (let [{:keys [paid-to client check date amount memo] {print-as :vendor/print-as vendor-name :vendor/name :as vendor} :vendor} check
-            _ (println "VENDOR" vendor)
+      (let [{:keys [bank-account paid-to client check date amount memo] {print-as :vendor/print-as vendor-name :vendor/name :as vendor} :vendor} check
             df (DecimalFormat. "#,###.00") 
             word-amount (num->words amount)
             
             amount (str "--" (.format df  amount) "--")]
             
         [:table {:num-cols 12 :border false :leading 11 :widths (distribute [2 3 3 3 3 3 3 3 3 2 2 2])}
-         [(let [{:keys [name bank] {:keys [street1 street2 city state zip ]} :address} client]
+         [(let [{:keys [:client/name] {:keys [:address/street1 :address/street2 :address/city :address/state :address/zip]} :client/address} client]
+            
             [:cell {:colspan 3 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ])
-          (let [{{:keys [name acct]} :bank} client]
-            [:cell {:colspan 7 :align :center} [:paragraph {:style :bold} name] [:paragraph {:size 8 :leading 8} acct]])
+          (let [{:keys [:bank-account/bank-name :bank-account/bank-code] } bank-account]
+            [:cell {:colspan 7 :align :center} [:paragraph {:style :bold} bank-name] [:paragraph {:size 8 :leading 8} bank-code]])
           [:cell {:colspan 2 :size 13}
            check]]
 
@@ -106,7 +106,7 @@
           [:cell {:colspan 6  }  (if (:signature-file client)
                                                         [:image { :top-margin 90 :xscale 0.30 :yscale 0.30 :align :center}
 
-                                                         (:signature-file client)]
+                                                         (:client/signature-file client)]
                                                         [:spacer])]]
 
          #_[
@@ -115,15 +115,15 @@
 
          [[:cell {:colspan 2}]
           [:cell {:colspan 10 :leading 30}
-           [:phrase {:size 18 :ttf-name "public/micrenc.ttf"} (str "c" check "c a" (:routing (:bank client)) "a " (:acct-number (:bank client)) "c")]]]
+           [:phrase {:size 18 :ttf-name "public/micrenc.ttf"} (str "c" check "c a" (:bank-account/routing bank-account) "a " (:bank-account/number bank-account) "c")]]]
          
          [[:cell {:colspan 12 :leading 18} [:spacer]]]
          
          [[:cell]
           (into
            [:cell {:colspan 9}]
-           (let [{:keys [name]
-                  {:keys [street1 city state zip bank]} :address} client]
+           (let [{:keys [:client/name]
+                  {:keys [:address/street1 :address/city :address/state :address/zip ]} :client/address} client]
              (list
               [:paragraph "  " name]
               [:paragraph "  " street1]
@@ -169,7 +169,7 @@
           [:cell {:colspan 5}
            [:paragraph check]
            [:paragraph vendor-name]
-           [:paragraph (:name (:bank client))]
+           [:paragraph (:bank-account/bank-name bank-account)]
            [:paragraph paid-to]
            [:paragraph amount]
            [:paragraph date]]]
@@ -250,7 +250,9 @@
                                                   :check (str (+ index (:bank-account/check-number bank-account)))
                                                   :memo  memo
                                                   :date (date->str (local-now))
-                                                  :client {:name (:name client)
+                                                  :client client
+                                                  :bank-account bank-account
+                                                  #_#_:client {:name (:name client)
                                                            :address (:address client)
                                                            :signature-file (:signature-file client)
                                                            :bank {:name (:bank-account/bank-name bank-account)
@@ -303,7 +305,7 @@
     @(d/transact (d/connect uri) checks)
     
     
-    {:invoices [] 
+    {:invoices  (d-invoices/get-multi (map :invoice-id invoice-payments))
      :pdf-url (if (= type :payment-type/check)
                 (merge-pdfs (filter identity (map :payment/s3-key checks)))
                 nil)}))