diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterCoordinator.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterCoordinator.kt
index 9d50a9dc..0033a08e 100644
--- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterCoordinator.kt
+++ b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/ConverterCoordinator.kt
@@ -7,12 +7,16 @@ import no.iktdev.exfl.coroutines.Coroutines
 import no.iktdev.mediaprocessing.converter.coordination.PersistentEventProcessBasedMessageListener
 import no.iktdev.mediaprocessing.shared.common.CoordinatorBase
 import no.iktdev.mediaprocessing.shared.common.persistance.PersistentProcessDataMessage
+import no.iktdev.mediaprocessing.shared.common.persistance.events
 import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents
 import no.iktdev.mediaprocessing.shared.kafka.dto.DeserializedConsumerRecord
 import no.iktdev.mediaprocessing.shared.kafka.dto.Message
 import no.iktdev.mediaprocessing.shared.kafka.dto.MessageDataWrapper
+import org.springframework.scheduling.annotation.EnableScheduling
+import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 
+@EnableScheduling
 @Service
 class ConverterCoordinator() : CoordinatorBase<PersistentProcessDataMessage, PersistentEventProcessBasedMessageListener>() {
     val io = Coroutines.io()
@@ -36,6 +40,7 @@ class ConverterCoordinator() : CoordinatorBase<PersistentProcessDataMessage, Per
     override fun onCoordinatorReady() {
         super.onCoordinatorReady()
         log.info { "Converter Coordinator is ready" }
+        generateMissingEvents()
         readAllInQueue()
     }
 
@@ -46,7 +51,10 @@ class ConverterCoordinator() : CoordinatorBase<PersistentProcessDataMessage, Per
             if (!success) {
                 log.error { "Unable to store message event: ${event.key.event} with eventId ${event.value.eventId} with referenceId ${event.value.referenceId} in database ${getEventsDatabase().database}!" }
             } else {
-                readAllMessagesFor(event.value.referenceId, event.value.eventId)
+                io.launch {
+                    delay(500)
+                    readAllMessagesFor(event.value.referenceId, event.value.eventId)
+                }
             }
         } else if (event.key == KafkaEvents.EventWorkExtractPerformed) {
             readAllInQueue()
@@ -65,9 +73,34 @@ class ConverterCoordinator() : CoordinatorBase<PersistentProcessDataMessage, Per
         }
     }
 
+    private fun generateMissingEvents() {
+        val existing = eventManager.getAllProcessEvents().filter { it.event == KafkaEvents.EventWorkConvertCreated }.map { it.eventId }
+        val messages = eventManager.getEventsUncompleted()
+
+        val myEvents = messages.flatten()
+            .filter { it.event == KafkaEvents.EventWorkConvertCreated }
+            .filter { existing.none { en -> en == it.eventId } }
+
+        myEvents.forEach {
+            eventManager.setProcessEvent(it.event, Message(
+                referenceId = it.referenceId,
+                eventId = it.eventId,
+                data = it.data
+            ))
+        }
+    }
+
+
     fun readAllMessagesFor(referenceId: String, eventId: String) {
         val messages = eventManager.getProcessEventsClaimable() // persistentReader.getAvailableProcessEvents()
         createTasksBasedOnEventsAndPersistence(referenceId, eventId, messages)
     }
 
+    @Scheduled(fixedDelay = (5*6_0000))
+    fun checkForWork() {
+        log.info { "Checking if there is any work to do.." }
+        readAllInQueue()
+        generateMissingEvents()
+    }
+
 }
\ No newline at end of file
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
index 9afa9246..cbca7155 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
@@ -76,14 +76,17 @@ class CompleteMediaTask(@Autowired override var coordinator: Coordinator) : Task
             StartOperationEvents.CONVERT to hasConvertAndIsRequired
         )
 
-
-
         if (missingRequired.values.any { !it }) {
             log.info { "Waiting for ${missingRequired.entries.filter { !it.value }.map { it.key.name }}" }
             return null
         }
 
-
+        val ch = CompleteHandler(events)
+        val chEvents = ch.getMissingCompletions()
+        if (chEvents.isNotEmpty()) {
+            log.info { "Waiting for ${chEvents.joinToString { "," }}" }
+            return null
+        }
 
 
 
@@ -93,4 +96,35 @@ class CompleteMediaTask(@Autowired override var coordinator: Coordinator) : Task
         }
         return null
     }
+
+    class CompleteHandler(val events: List<PersistentMessage>) {
+        var report: Map<KafkaEvents, Int> = listOf(
+            EventReport.fromEvents(EventWorkEncodeCreated, events),
+            EventReport.fromEvents(EventWorkExtractCreated, events),
+            EventReport.fromEvents(EventWorkConvertCreated, events),
+
+            EventReport.fromEvents(EventWorkEncodePerformed, events),
+            EventReport.fromEvents(EventWorkExtractPerformed, events),
+            EventReport.fromEvents(EventWorkConvertPerformed, events)
+        ).associate { it.event to it.count }
+
+        fun getMissingCompletions(): List<StartOperationEvents> {
+            val missings = mutableListOf<StartOperationEvents>()
+            if (report[EventWorkEncodeCreated] != report[EventWorkEncodePerformed])
+                missings.add(StartOperationEvents.ENCODE)
+            if (report[EventWorkExtractCreated] != report[EventWorkExtractPerformed])
+                missings.add(StartOperationEvents.EXTRACT)
+            if (report[EventWorkConvertCreated] == report[EventWorkConvertPerformed])
+                missings.add(StartOperationEvents.CONVERT)
+            return missings
+        }
+
+        data class EventReport(val event: KafkaEvents, val count: Int) {
+            companion object {
+                fun fromEvents(event: KafkaEvents, events: List<PersistentMessage>): EventReport {
+                    return EventReport(event = event, count = events.filter { it.event == event }.size)
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Coordinator.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Coordinator.kt
index 0fcc7149..7c0319da 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Coordinator.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/Coordinator.kt
@@ -96,28 +96,23 @@ class Coordinator(): CoordinatorBase<PersistentProcessDataMessage, PersistentEve
     }
 
     private fun generateMissingEvents() {
-        val existing = eventManager.getAllProcessEvents().map { it.eventId }
+        val existing = eventManager.getAllProcessEvents().filter { it.event in processKafkaEvents }.map { it.eventId }
         val messages = eventManager.getEventsUncompleted()
 
 
-        val usableMessages = messages.filter { lists -> lists.any { it.event in processKafkaEvents } }
-
-
-        val validMessages = usableMessages.filter { lists ->
-            lists.any { it.event == KafkaEvents.EventMediaProcessStarted && (it.data as MediaProcessStarted).type == ProcessType.FLOW } ||
-                 lists.any { it.event == KafkaEvents.EventMediaWorkProceedPermitted }
-        }
-            .flatten()
+        val myEvents = messages.flatten()
             .filter { it.event in processKafkaEvents }
+            .filter { existing.none { en -> en == it.eventId } }
 
 
-        validMessages.filter { it.eventId !in existing }.forEach {
+        myEvents.forEach {
             eventManager.setProcessEvent(it.event, Message(
                 referenceId = it.referenceId,
                 eventId = it.eventId,
                 data = it.data
             ))
         }
+
     }
 
     fun readAllMessagesFor(referenceId: String, eventId: String) {
@@ -139,6 +134,7 @@ class Coordinator(): CoordinatorBase<PersistentProcessDataMessage, PersistentEve
     fun checkForWork() {
         log.info { "Checking if there is any work to do.." }
         readAllAvailableInQueue()
+        generateMissingEvents()
     }
 
     interface CoordinatorEvents {