diff --git a/src/system.clj b/src/system.clj
index e57f769..d675a26 100644
--- a/src/system.clj
+++ b/src/system.clj
@@ -62,7 +62,6 @@
     (swap! system-atom start)))
 
 (defn -main [& args]
-  (let [main-system (atom (system/system))]
-    (swap! main-system system/start)
+  (let [main-system (system/start nil)]
     (.addShutdownHook (Runtime/getRuntime)
-                      (Thread. (partial swap! main-system stop)))))
+                      (Thread. #(stop main-system)))))