diff --git a/src/wanijo/infrastructure/neo4j.clj b/src/wanijo/infrastructure/neo4j.clj
index 0c5b463..4423bbb 100644
--- a/src/wanijo/infrastructure/neo4j.clj
+++ b/src/wanijo/infrastructure/neo4j.clj
@@ -15,23 +15,28 @@
     #"[0-9a-f]+-[0-9a-f]+-[0-9a-f]+-[0-9a-f]+-[0-9a-f]+" %))
 
 (def conn
-  (let [env #(or (System/getenv %1) %2)
-        port (env "NEO4J_PORT" "7687")
-        host (env "NEO4J_HOST" "localhost")
-        user (env "NEO4J_USER" "neo4j")
-        pass (env "NEO4J_PASS" "b")]
-    (delay (db/connect
-            (str "bolt://" host ":" port)
-            user
-            pass))))
+  (delay
+    (let [env #(or (System/getenv %1) %2)
+          port (env "NEO4J_PORT" "7687")
+          host (env "NEO4J_HOST" "localhost")
+          user (env "NEO4J_USER" "neo4j")
+          pass (env "NEO4J_PASS" "b")]
+      (db/connect
+        (str "bolt://" host ":" port)
+        user
+        pass))))
 
-(defmacro defquery [& args] `(db/defquery ~@args))
+(defonce query-strings (atom {}))
+(defmacro defquery [name query]
+  `(do (def ~name (db/create-query ~query))
+       (swap! wanijo.infrastructure.neo4j/query-strings
+              assoc (hash ~name) ~query)))
 
 (defn uuid []
   (str (UUID/randomUUID)))
 
 (defn butiful-query [qry]
-  (->> qry
+  (->> (get @query-strings (hash qry))
        str
        cljs/trim-newline
        cljs/split-lines
@@ -41,12 +46,17 @@
 
 (defn exec-query! [qry params]
   (with-open [session (db/get-session @conn)]
-    (println "executing query" qry "with params" params)
-    (devmode/send-to-bar
-     (str (butiful-query qry)
-          "<br>---Params---<br>"
-          params))
-    (qry session params)))
+    (let [query-string (get @query-strings (hash qry))
+          query-string (-> query-string
+                           (cljs/replace #"\n" "")
+                           (cljs/replace #"\s+" " "))
+          query-string (str \" query-string \")]
+      (println "query" query-string "with params" params)
+      (devmode/send-to-bar
+        (str (butiful-query qry)
+             "<br>---Params---<br>"
+             params))
+      (qry session params))))
 
 (spec/def ::tuple-query-list
   (spec/coll-of
diff --git a/src/wanijo/infrastructure/repl.clj b/src/wanijo/infrastructure/repl.clj
index fccd4ec..40d0419 100644
--- a/src/wanijo/infrastructure/repl.clj
+++ b/src/wanijo/infrastructure/repl.clj
@@ -97,4 +97,5 @@
 
 (defn dev-server! []
   (main/stop-server!)
-  (main/start-server-dev!))
+  (main/start-server-dev!)
+  (println "Startet server at http://localhost:8080"))