         options (combine-options command-line-args system-description)
         pre-init (-> system-description
                      :initialization-map
-                     (system-map! options))]
-    (dependencies pre-init (:dependencies system-description))
-    #_(component/system-using dependencies)))
+                     (cpt-dsl/system-map options))]
+    (cpt-dsl/dependencies pre-init (:dependencies system-description))))
 
 ;; TODO: This needs to be a unit test
 (comment

            [clojure.java.io :as io]
            [com.stuartsierra.component :as component]
            [com.frereth.common.util :as common]
            [io.aviso.config :as cfg]
            [ribol.core :refer (raise)]
            [schema.core :as s]

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Schema



;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Internals

(defn configure-logging!
  "Doesn't belong here
TODO: Move to a Component in common"
  [log-file-name]
  (log/set-config!
   ;; TODO: This needs to rotate
