diff --git a/src/plauna/core/events.clj b/src/plauna/core/events.clj
index d58c851..1a3b37e 100644
--- a/src/plauna/core/events.clj
+++ b/src/plauna/core/events.clj
@@ -1,4 +1,7 @@
-(ns plauna.core.events)
+(ns plauna.core.events
+  (:require
+   [clojure.core.async :refer [chan go <! go-loop] :as async]
+   [taoensso.telemere :as t]))
 
 (defn create-event
   ([type payload options]
@@ -9,3 +12,22 @@
    {:type type
     :options (conj (:options triggering-event) options)
     :payload payload}))
+
+(defn return-key-on-complete [key fn]
+  (t/log! :info ["Starting restart loop for" key])
+  (go  (let [return-val (<! (fn))]
+         (t/log! :debug ["Event loop for" key "returned" return-val])
+         key)))
+
+(defn keep-track [active-register event-register]
+  (go-loop [merged (async/merge (vals active-register))]
+    (when-let [event-key (<! merged)]
+      (recur (async/merge (vals (conj active-register {event-key (return-key-on-complete event-key (get event-register event-key))})))))))
+
+(defn start-event-loops
+  "Start event loops which restart by themselves if they somehow complete.
+
+  Takes an event register in the form {:event-key event-fn} where event-fn should always return a channel."
+  [event-register]
+  (let [active-register (reduce (fn [register entry] (conj register {(first entry) (return-key-on-complete (first entry) (second entry))})) {} event-register)]
+    (keep-track active-register event-register)))
diff --git a/src/plauna/entry.clj b/src/plauna/entry.clj
index 15bec4a..8c40c1e 100644
--- a/src/plauna/entry.clj
+++ b/src/plauna/entry.clj
@@ -1,7 +1,7 @@
 (ns plauna.entry
   (:require
    [clojure.string :as s]
-   [clojure.core.async :refer [chan]]
+   [clojure.core.async :refer [chan] :as async]
    [plauna.files :as files]
    [plauna.server :as server]
    [plauna.client :as client]
@@ -10,7 +10,8 @@
    [plauna.analysis :as analysis]
    [taoensso.telemere :as t]
    [taoensso.telemere.streams :as tstreams]
-   [plauna.parser :as parser])
+   [plauna.parser :as parser]
+   [plauna.core.events :as events])
   (:gen-class))
 
 (tstreams/streams->telemere!)
@@ -22,6 +23,11 @@
 (defmulti parse-cli-arg (fn [arg] (first (s/split arg #"="))))
 (defmethod parse-cli-arg "--config-file" [arg-string] {:config-file (second (s/split arg-string #"="))})
 
+(def event-register {:enrichment-event-loop (fn [] (analysis/enrichment-event-loop @messaging/main-publisher @messaging/main-chan))
+                     :client-event-loop (fn [] (client/client-event-loop @messaging/main-publisher))
+                     :database-event-loop (fn [] (database/database-event-loop @messaging/main-publisher))
+                     :parser-event-loop (fn [] (parser/parser-event-loop @messaging/main-publisher @messaging/main-chan))})
+
 (defn start-imap-client
   [config]
   (let [listen-channel (chan 10)]
@@ -30,12 +36,6 @@
       (client/create-folder-monitor client-config listen-channel))
     (t/log! :debug "Listening to new emails from listen-channel")))
 
-(defn start-event-loops [main-publisher main-channel]
-  (parser/parser-event-loop main-publisher main-channel)
-  (database/database-event-loop main-publisher)
-  (client/client-event-loop main-publisher)
-  (analysis/enrichment-event-loop main-publisher main-channel))
-
 (defn -main
   [& args]
   (let [parsed-config (reduce (fn [acc val] (conj acc (parse-cli-arg val))) {} args)]
@@ -44,5 +44,5 @@
     (doseq [address (:addresses (:email (files/config)))] (database/add-to-my-addresses address))
     (database/create-db)
     (start-imap-client (files/config))
-    (start-event-loops @messaging/main-publisher @messaging/main-chan)
+    (events/start-event-loops event-register)
     (server/start-server (files/config))))
diff --git a/test/plauna/core/events_test.clj b/test/plauna/core/events_test.clj
new file mode 100644
index 0000000..7621a77
--- /dev/null
+++ b/test/plauna/core/events_test.clj
@@ -0,0 +1,37 @@
+(ns plauna.core.events-test
+  (:require [plauna.core.events :as events]
+            [clojure.core.async :as async]
+            [clojure.test :as test]))
+
+(test/deftest return-key-on-complete-works
+  (let [test-chan (async/chan)
+        test-fn (fn [] (async/go (async/<! test-chan)))
+        test-case (events/return-key-on-complete :test-key test-fn)]
+    (async/close! test-chan)
+    (test/is (= :test-key (async/<!! test-case)))))
+
+(test/deftest keep-track-works
+  (let [test-atom (atom 0)
+        test-chan (atom (async/chan))
+        test-fn (fn [] (async/go (swap! test-atom inc) (async/<! @test-chan)))
+        test-register {:test-case test-fn}]
+    (events/keep-track {:test-case (events/return-key-on-complete :test-case test-fn)} test-register)
+    (swap! test-chan (fn [old] (async/close! old) (async/chan)))
+    (Thread/sleep 100)
+    (swap! test-chan (fn [old] (async/close! old) (async/chan)))
+    (Thread/sleep 100)
+    (test/is (= 2 @test-atom))))
+
+(test/deftest event-register-works
+  (let [test-atom (atom 0)
+        test-chan (atom (async/chan))
+        test-fn (fn [] (async/go (swap! test-atom inc) (async/<! @test-chan)))
+        test-register {:test-case test-fn}]
+    (events/start-event-loops test-register)
+    (swap! test-chan (fn [old] (async/close! old) (async/chan)))
+    (Thread/sleep 100)
+    (swap! test-chan (fn [old] (async/close! old) (async/chan)))
+    (Thread/sleep 100)
+    (swap! test-chan (fn [old] (async/close! old) (async/chan)))
+    (Thread/sleep 100)
+    (test/is (= 3 @test-atom))))