diff --git a/src/dawntools/vnscenetool/VNSceneGen.cpp b/src/dawntools/vnscenetool/VNSceneGen.cpp
index 38a01ac1..fa061a6d 100644
--- a/src/dawntools/vnscenetool/VNSceneGen.cpp
+++ b/src/dawntools/vnscenetool/VNSceneGen.cpp
@@ -11,41 +11,43 @@ void VNSceneGen::test(
   std::string eventName,
   struct VNSceneEvent *event,
   int32_t *eventIndex,
-  std::vector<std::string> *body,
+  std::vector<std::string> *eventInit,
+  std::vector<std::string> *eventChain,
   std::vector<std::string> *includes
 ) {
   std::string initType = "";
   std::string toInclude = "";
   std::string initArgs = "";
-  std::vector<std::string> afterLines;
+
+  std::vector<std::string> eventInitAfter;
 
   switch(event->type) {
     case VN_SCENE_EVENT_TYPE_TEXT:
       initType = "VNTextEvent";
       toInclude = "games/vn/events/VNTextEvent.hpp";
-      line(&afterLines, eventName + "->" + "text = " + event->text.texts.begin()->text + ";", "");
+      line(&eventInitAfter, eventName + "->" + "text = " + event->text.texts.begin()->text + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_POSITION:
       initType = "VNPositionEvent";
       toInclude = "games/vn/events/VNPositionEvent.hpp";
-      line(&afterLines, eventName + "->item = " + event->position.item + ";", "");
-      if(event->position.x != "") line(&afterLines, eventName + "->" + "to.x = " + event->position.x + ";", "");
-      if(event->position.y != "") line(&afterLines, eventName + "->" + "to.y = " + event->position.y + ";", "");
-      if(event->position.z != "") line(&afterLines, eventName + "->" + "to.z = " + event->position.z + ";", "");
+      line(&eventInitAfter, eventName + "->item = " + event->position.item + ";", "");
+      if(event->position.x != "") line(&eventInitAfter, eventName + "->" + "to.x = " + event->position.x + ";", "");
+      if(event->position.y != "") line(&eventInitAfter, eventName + "->" + "to.y = " + event->position.y + ";", "");
+      if(event->position.z != "") line(&eventInitAfter, eventName + "->" + "to.z = " + event->position.z + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_SET:
       initType = "VNSetEvent<" + event->set.type + ">";
       toInclude = "games/vn/events/VNSetEvent.hpp";
-      line(&afterLines, eventName + "->modifies = &" + event->set.property + ";", "");
-      line(&afterLines, eventName + "->value = " + event->set.to + ";", "");
+      line(&eventInitAfter, eventName + "->modifies = &" + event->set.property + ";", "");
+      line(&eventInitAfter, eventName + "->value = " + event->set.to + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_WAIT:
       initType = "VNWaitEvent";
       toInclude = "games/vn/events/VNWaitEvent.hpp";
-      line(&afterLines, eventName + "->duration = " + event->wait.duration + ";", "");
+      line(&eventInitAfter, eventName + "->duration = " + event->wait.duration + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_PARALLEL: {
@@ -59,11 +61,12 @@ void VNSceneGen::test(
           pEventName,
           &(*itParallel),
           eventIndex,
-          &afterLines,
+          eventInit,
+          eventChain,
           includes
         );
-        line(&afterLines, eventName + "->events.push_back(" + pEventName + ");", "");
-        line(&afterLines, "", "");
+        line(&eventInitAfter, eventName + "->events.push_back(" + pEventName + ");", "");
+        line(&eventInitAfter, "", "");
         ++itParallel;
       }
       break;
@@ -72,24 +75,24 @@ void VNSceneGen::test(
     case VN_SCENE_EVENT_TYPE_MARKER:
       initType = "VNDummyEvent";
       toInclude = "games/vn/events/VNDummyEvent.hpp";
-      line(&afterLines, "auto marker_" + event->marker.name + " = " + eventName + ";", "");
+      line(&eventInitAfter, "auto marker_" + event->marker.name + " = " + eventName + ";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_GOTO_MARKER:
       initType = "VNDummyEvent";
       toInclude = "games/vn/events/VNDummyEvent.hpp";
-      line(&afterLines, eventName + "->then(marker_" + event->gotoMarker.name + ");", "");
+      line(eventChain, eventName + "->then(marker_" + event->gotoMarker.name + ");", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_CHOICES: {
       initType = "VNChoiceEvent";
       toInclude = "games/vn/events/VNChoiceEvent.hpp";
 
-      line(&afterLines, eventName + "->key = \"" + event->choices.key+ "\";", "");
-      line(&afterLines, eventName + "->text = " + event->choices.titles.begin()->text + ";", "");
+      line(&eventInitAfter, eventName + "->key = \"" + event->choices.key+ "\";", "");
+      line(&eventInitAfter, eventName + "->text = " + event->choices.titles.begin()->text + ";", "");
       auto itChoices = event->choices.choices.begin();
       while(itChoices != event->choices.choices.end()) {
-        line(&afterLines, eventName + "->choices[\"" + itChoices->value + "\"] = " + itChoices->texts.begin()->text + ";", "");
+        line(&eventInitAfter, eventName + "->choices[\"" + itChoices->value + "\"] = " + itChoices->texts.begin()->text + ";", "");
         ++itChoices;
       }
       break;
@@ -98,15 +101,15 @@ void VNSceneGen::test(
     case VN_SCENE_EVENT_TYPE_CHOICE_SET:
       initType = "VNChoiceSetEvent";
       toInclude = "games/vn/events/VNChoiceSetEvent.hpp";
-      line(&afterLines, eventName + "->key = \"" + event->choiceSet.key + "\";", "");
-      line(&afterLines, eventName + "->value = \"" + event->choiceSet.value + "\";", "");
+      line(&eventInitAfter, eventName + "->key = \"" + event->choiceSet.key + "\";", "");
+      line(&eventInitAfter, eventName + "->value = \"" + event->choiceSet.value + "\";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_IF: {
       initType = "VNIfEvent";
       toInclude = "games/vn/events/VNIfEvent.hpp";
-      line(&afterLines, eventName + "->key = \"" + event->ifEvent.key + "\";", "");
-      line(&afterLines, eventName + "->value = \"" + event->ifEvent.value + "\";", "");
+      line(&eventInitAfter, eventName + "->key = \"" + event->ifEvent.key + "\";", "");
+      line(&eventInitAfter, eventName + "->value = \"" + event->ifEvent.value + "\";", "");
 
       std::string ifPrevious = "";
       std::string ifFirst = "";
@@ -117,10 +120,11 @@ void VNSceneGen::test(
           ifEventName,
           &(*itIf),
           eventIndex,
-          &afterLines,
+          eventInit,
+          eventChain,
           includes
         );
-        if(!ifPrevious.empty()) line(&afterLines, ifPrevious + "->then(" + ifEventName + ");", "");
+        if(!ifPrevious.empty()) line(eventChain, ifPrevious + "->then(" + ifEventName + ");", "");
         ifPrevious = ifEventName;
         if(ifFirst == "") ifFirst = ifEventName;
         ++itIf;
@@ -131,8 +135,8 @@ void VNSceneGen::test(
         assertUnreachable();
       }
 
-      line(&afterLines, eventName + "->ifTrue = " + ifFirst + ";", "");
-      line(&afterLines, eventName + "->ifEnd = " + ifPrevious + ";", "");
+      line(eventChain, eventName + "->ifTrue = " + ifFirst + ";", "");
+      line(eventChain, eventName + "->ifEnd = " + ifPrevious + ";", "");
       break;
     }
 
@@ -149,8 +153,8 @@ void VNSceneGen::test(
 
   if(!toInclude.empty()) includes->push_back(toInclude);
 
-  line(body, "auto " + eventName + " = vnManager->createEvent<" + initType + ">(" + initArgs + ");", "");
-  lines(body, afterLines, "");
+  line(eventInit, "auto " + eventName + " = vnManager->createEvent<" + initType + ">(" + initArgs + ");", "");
+  lines(eventInit, eventInitAfter, "");
 }
 
 void VNSceneGen::generate(
@@ -162,7 +166,6 @@ void VNSceneGen::generate(
   struct MethodGenInfo methodAssets;
   struct MethodGenInfo methodInit;
 
-
   // Load Scene
   SceneGenerator::generate(
     &scene->scene,
@@ -181,23 +184,30 @@ void VNSceneGen::generate(
   int32_t eventIndex = 0;
   auto itEvents = scene->events.events.begin();
   std::string previous = "eventStart";
+
+  std::vector<std::string> eventInit;
+  std::vector<std::string> eventChain;
+
   while(itEvents != scene->events.events.end()) {
-    line(&methodInit.body, "", "");
+    line(&eventInit, "", "");
     std::string eventName = "event" + std::to_string(eventIndex++);
     VNSceneGen::test(
       eventName,
       &(*itEvents),
       &eventIndex,
-      &methodInit.body,
+      &eventInit,
+      &eventChain,
       &classInfo.includes
     );
-    line(&methodInit.body, previous + "->then(" + eventName + ");", "");
+    if(!previous.empty()) line(&eventChain, previous + "->then(" + eventName + ");", "");
     previous = eventName;
+    if(itEvents->type == VN_SCENE_EVENT_TYPE_GOTO_MARKER) previous = "";
     ++itEvents;
   }
-  line(&methodInit.body, "", "");
-  line(&methodInit.body, "vnManager->setEvent(eventStart);", "");
 
+  lines(&methodInit.body, eventInit, "");
+  lines(&methodInit.body, eventChain, "");
+  line(&methodInit.body, "vnManager->setEvent(eventStart);", "");
 
   // Add in methods
   CodeGen::methodGen(&classInfo.publicCode, methodAssets);
diff --git a/src/dawntools/vnscenetool/VNSceneGen.hpp b/src/dawntools/vnscenetool/VNSceneGen.hpp
index 6dd05f59..2addd290 100644
--- a/src/dawntools/vnscenetool/VNSceneGen.hpp
+++ b/src/dawntools/vnscenetool/VNSceneGen.hpp
@@ -15,7 +15,8 @@ namespace Dawn {
         std::string eventName,
         struct VNSceneEvent *event,
         int32_t *eventIndex,
-        std::vector<std::string> *body,
+        std::vector<std::string> *eventInit,
+        std::vector<std::string> *eventChain,
         std::vector<std::string> *includes
       );