diff --git a/playground/matplus/dan-funk/dan-funk.bpmn b/playground/matplus/dan-funk/dan-funk.bpmn
index 50984663..6d662ea3 100644
--- a/playground/matplus/dan-funk/dan-funk.bpmn
+++ b/playground/matplus/dan-funk/dan-funk.bpmn
@@ -1,299 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:spiffworkflow="http://spiffworkflow.org/bpmn/schema/1.0/core" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
-  <bpmn:collaboration id="Collaboration_123cc2j" messages="[object Object],[object Object],[object Object]">
-    <bpmn:participant id="Participant_1v2xo7y" processRef="Process_dan_funk_5t3nhn3" />
-  </bpmn:collaboration>
-  <bpmn:process id="Process_dan_funk_5t3nhn3" isExecutable="true">
-    <bpmn:dataObjectReference id="DataObjectReference_09r1zzv" />
-    <bpmn:dataObjectReference id="DataObjectReference_0nby41g" />
-    <bpmn:startEvent id="Event_1fuga7w">
-      <bpmn:outgoing>Flow_0szh8pc</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:endEvent id="Event_1r7u3r3">
-      <bpmn:incoming>Flow_15ssmj7</bpmn:incoming>
-      <bpmn:incoming>Flow_0rls95r</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:scriptTask id="Activity_00tgyxo" name="Simple Script Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:unitTests>
-          <spiffworkflow:unitTest id="simple_test">
-            <spiffworkflow:inputJson>{}</spiffworkflow:inputJson>
-            <spiffworkflow:expectedOutputJson>{
-  "age": 55,
-  "height": 1.93,
-  "children": [
-    "Robert",
-    "Edward",
-    "Willie",
-    "Tadd"
-  ],
-  "is_married": true,
-  "cabinet": {
-    "Secretary of State": {
-      "name": "William H. Seward",
-      "age": 60,
-      "children": [
-        "William Jr.",
-        "Frederick",
-        "Augustus",
-        "Anna"
-      ]
-    }
-  },
-  "seward": "William H. Seward"
-}</spiffworkflow:expectedOutputJson>
-          </spiffworkflow:unitTest>
-        </spiffworkflow:unitTests>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0szh8pc</bpmn:incoming>
-      <bpmn:outgoing>Flow_1ieaamx</bpmn:outgoing>
-      <bpmn:script>age = 51
-height = 1.93
-children = ["Robert", "Edward", "Willie", "Tadd"]
-is_married = True
-
-size="medium"
-
-first_name = "Abe"
-last_name = "Lincoln" 
-
-Age = 60
-age = 54
-
-del(Age) 
-
-cabinet = {
-   "Secretary of State": "William H. Seward",
-   "Secretary of the Treasury": "Salmon P. Chase",
-   "Secretary of War": "Edwin M. Stanton",
-   "Attorney General": "Edward Bates"
-}
-
-seward = cabinet['Secretary of State']
-
-cabinet = {
-   "Secretary of State": {
-       "name": "William H. Seward",
-       "age": 60,
-       "children": ['William Jr.', 'Frederick', 'Augustus', 'Anna']
-   }
-}
-
-def add_one(input):
-    return input + 1
-
-age = add_one(age)
-
-
-my_name = "Dan Funk"
-x = "don't do this"
-fn = "Dan"
-first_name = "Dan"
-
-</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:userTask id="Activity_1qrgbu9" name="Simple User Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:properties>
-          <spiffworkflow:property name="formJsonSchemaFilename" value="simple-user-task-schema.json" />
-          <spiffworkflow:property name="formUiSchemaFilename" value="simple-user-task-uischema.json" />
-        </spiffworkflow:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1w62nhn</bpmn:incoming>
-      <bpmn:outgoing>Flow_0av3i4o</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:serviceTask id="Activity_0ir5asl" name="Simple Service Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="http/GetRequest" resultVariable="response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="url" type="str" value="&#34;https://dog.ceo/api/breeds/image/random&#34;" />
-            <spiffworkflow:parameter id="headers" type="any" />
-            <spiffworkflow:parameter id="params" type="any" />
-            <spiffworkflow:parameter id="basic_auth_username" type="str" />
-            <spiffworkflow:parameter id="basic_auth_password" type="str" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0wru4o3</bpmn:incoming>
-      <bpmn:outgoing>Flow_1ppsinh</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:manualTask id="Activity_1ow98bt" name="Simple Manual Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>![Minion]({{response.message}})
-
-</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0mh2mbr</bpmn:incoming>
-      <bpmn:outgoing>Flow_1nq7xbv</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:businessRuleTask id="Activity_0zx244q" name="Simple Business Rule">
-      <bpmn:extensionElements>
-        <spiffworkflow:calledDecisionId>decision_1</spiffworkflow:calledDecisionId>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0oyc1oz</bpmn:incoming>
-      <bpmn:outgoing>Flow_0zqmkvl</bpmn:outgoing>
-    </bpmn:businessRuleTask>
-    <bpmn:serviceTask id="Activity_1dceci2" name="Simple Service Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="http/GetRequest" resultVariable="response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="url" type="str" value="&#34;https://dog.ceo/api/breeds/image/random&#34;" />
-            <spiffworkflow:parameter id="headers" type="any" />
-            <spiffworkflow:parameter id="params" type="any" />
-            <spiffworkflow:parameter id="basic_auth_username" type="str" />
-            <spiffworkflow:parameter id="basic_auth_password" type="str" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1ieaamx</bpmn:incoming>
-      <bpmn:outgoing>Flow_1w62nhn</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:inclusiveGateway id="Gateway_156cl94" name="title is ...." default="Flow_0oyc1oz">
-      <bpmn:incoming>Flow_0av3i4o</bpmn:incoming>
-      <bpmn:outgoing>Flow_0wru4o3</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0mh2mbr</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0oyc1oz</bpmn:outgoing>
-    </bpmn:inclusiveGateway>
-    <bpmn:inclusiveGateway id="Gateway_0z8t5sa">
-      <bpmn:incoming>Flow_1ppsinh</bpmn:incoming>
-      <bpmn:incoming>Flow_1nq7xbv</bpmn:incoming>
-      <bpmn:incoming>Flow_0zqmkvl</bpmn:incoming>
-      <bpmn:outgoing>Flow_15ssmj7</bpmn:outgoing>
-    </bpmn:inclusiveGateway>
-    <bpmn:boundaryEvent id="Event_1yfqm65" name="cancel" attachedToRef="Activity_1qrgbu9" messageRef="[object Object]">
-      <bpmn:outgoing>Flow_0rls95r</bpmn:outgoing>
-      <bpmn:messageEventDefinition id="MessageEventDefinition_0fvmyb4" messageRef="Message_0ccgmcf" />
-    </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="Flow_0szh8pc" sourceRef="Event_1fuga7w" targetRef="Activity_00tgyxo" />
-    <bpmn:sequenceFlow id="Flow_15ssmj7" sourceRef="Gateway_0z8t5sa" targetRef="Event_1r7u3r3" />
-    <bpmn:sequenceFlow id="Flow_1ieaamx" sourceRef="Activity_00tgyxo" targetRef="Activity_1dceci2" />
-    <bpmn:sequenceFlow id="Flow_1w62nhn" sourceRef="Activity_1dceci2" targetRef="Activity_1qrgbu9" />
-    <bpmn:sequenceFlow id="Flow_0av3i4o" sourceRef="Activity_1qrgbu9" targetRef="Gateway_156cl94" />
-    <bpmn:sequenceFlow id="Flow_0wru4o3" name="... simple" sourceRef="Gateway_156cl94" targetRef="Activity_0ir5asl">
-      <bpmn:conditionExpression>title == "simple"</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1ppsinh" sourceRef="Activity_0ir5asl" targetRef="Gateway_0z8t5sa" />
-    <bpmn:sequenceFlow id="Flow_0mh2mbr" name="...manual" sourceRef="Gateway_156cl94" targetRef="Activity_1ow98bt">
-      <bpmn:conditionExpression>title == "manual"</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1nq7xbv" sourceRef="Activity_1ow98bt" targetRef="Gateway_0z8t5sa" />
-    <bpmn:sequenceFlow id="Flow_0oyc1oz" sourceRef="Gateway_156cl94" targetRef="Activity_0zx244q" />
-    <bpmn:sequenceFlow id="Flow_0zqmkvl" sourceRef="Activity_0zx244q" targetRef="Gateway_0z8t5sa" />
-    <bpmn:sequenceFlow id="Flow_0rls95r" sourceRef="Event_1yfqm65" targetRef="Event_1r7u3r3" />
-  </bpmn:process>
   <bpmn:message id="Message_0ccgmcf" name="cancel">
     <bpmn:extensionElements>
       <spiffworkflow:messageVariable>cancel_message</spiffworkflow:messageVariable>
     </bpmn:extensionElements>
   </bpmn:message>
+  <bpmn:process id="Process_17itlj1">
+    <bpmn:startEvent id="Event_1h154wn">
+      <bpmn:outgoing>Flow_0uztvcl</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_0uztvcl" sourceRef="Event_1h154wn" targetRef="Activity_0cvfx9v" />
+    <bpmn:endEvent id="Event_0tva8pz">
+      <bpmn:incoming>Flow_1i3strz</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_1i3strz" sourceRef="Activity_14pdcpl" targetRef="Event_0tva8pz" />
+    <bpmn:sequenceFlow id="Flow_1uu9ae4" sourceRef="Activity_0cvfx9v" targetRef="Activity_14pdcpl" />
+    <bpmn:scriptTask id="Activity_0cvfx9v" name="initialize">
+      <bpmn:incoming>Flow_0uztvcl</bpmn:incoming>
+      <bpmn:outgoing>Flow_1uu9ae4</bpmn:outgoing>
+      <bpmn:script>a = 1</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:scriptTask id="Activity_14pdcpl" name="add 1">
+      <bpmn:incoming>Flow_1uu9ae4</bpmn:incoming>
+      <bpmn:outgoing>Flow_1i3strz</bpmn:outgoing>
+      <bpmn:standardLoopCharacteristics loopMaximum="10" />
+    </bpmn:scriptTask>
+  </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_123cc2j">
-      <bpmndi:BPMNShape id="Participant_1v2xo7y_di" bpmnElement="Participant_1v2xo7y" isHorizontal="true">
-        <dc:Bounds x="-650" y="-50" width="1240" height="370" />
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_17itlj1">
+      <bpmndi:BPMNShape id="Event_0tva8pz_di" bpmnElement="Event_0tva8pz">
+        <dc:Bounds x="462" y="192" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1fuga7w_di" bpmnElement="Event_1fuga7w">
-        <dc:Bounds x="-458" y="92" width="36" height="36" />
+      <bpmndi:BPMNShape id="Event_1h154wn_di" bpmnElement="Event_1h154wn">
+        <dc:Bounds x="92" y="192" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1r7u3r3_di" bpmnElement="Event_1r7u3r3">
-        <dc:Bounds x="532" y="92" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_003fg1c_di" bpmnElement="Activity_00tgyxo">
-        <dc:Bounds x="-380" y="70" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1uj2wtc_di" bpmnElement="Activity_0cvfx9v">
+        <dc:Bounds x="170" y="170" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1wrp6rk_di" bpmnElement="Activity_1qrgbu9">
-        <dc:Bounds x="-70" y="70" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0xafp5o_di" bpmnElement="Activity_0ir5asl">
-        <dc:Bounds x="190" y="70" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1b59yvt_di" bpmnElement="Activity_14pdcpl">
+        <dc:Bounds x="310" y="170" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_12l2xmp_di" bpmnElement="Activity_1ow98bt">
-        <dc:Bounds x="190" y="170" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1sjpnoj_di" bpmnElement="Activity_0zx244q">
-        <dc:Bounds x="190" y="-30" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1kq62zx" bpmnElement="Activity_1dceci2">
-        <dc:Bounds x="-230" y="70" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1640xpg_di" bpmnElement="Gateway_156cl94">
-        <dc:Bounds x="65" y="85" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="98" y="133" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_15q67e9_di" bpmnElement="Gateway_0z8t5sa">
-        <dc:Bounds x="365" y="85" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0talpe4_di" bpmnElement="Event_1yfqm65">
-        <dc:Bounds x="-18" y="132" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-46" y="163" width="32" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_0szh8pc_di" bpmnElement="Flow_0szh8pc">
-        <di:waypoint x="-422" y="110" />
-        <di:waypoint x="-380" y="110" />
+      <bpmndi:BPMNEdge id="Flow_0uztvcl_di" bpmnElement="Flow_0uztvcl">
+        <di:waypoint x="128" y="210" />
+        <di:waypoint x="170" y="210" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_15ssmj7_di" bpmnElement="Flow_15ssmj7">
-        <di:waypoint x="415" y="110" />
-        <di:waypoint x="532" y="110" />
+      <bpmndi:BPMNEdge id="Flow_1i3strz_di" bpmnElement="Flow_1i3strz">
+        <di:waypoint x="410" y="210" />
+        <di:waypoint x="462" y="210" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1ieaamx_di" bpmnElement="Flow_1ieaamx">
-        <di:waypoint x="-280" y="110" />
-        <di:waypoint x="-230" y="110" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1w62nhn_di" bpmnElement="Flow_1w62nhn">
-        <di:waypoint x="-130" y="110" />
-        <di:waypoint x="-70" y="110" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0av3i4o_di" bpmnElement="Flow_0av3i4o">
-        <di:waypoint x="30" y="110" />
-        <di:waypoint x="65" y="110" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0wru4o3_di" bpmnElement="Flow_0wru4o3">
-        <di:waypoint x="115" y="110" />
-        <di:waypoint x="190" y="110" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="130" y="92" width="45" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1ppsinh_di" bpmnElement="Flow_1ppsinh">
-        <di:waypoint x="290" y="110" />
-        <di:waypoint x="365" y="110" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0mh2mbr_di" bpmnElement="Flow_0mh2mbr">
-        <di:waypoint x="90" y="135" />
-        <di:waypoint x="90" y="210" />
-        <di:waypoint x="190" y="210" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="127" y="193" width="46" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1nq7xbv_di" bpmnElement="Flow_1nq7xbv">
-        <di:waypoint x="290" y="210" />
-        <di:waypoint x="390" y="210" />
-        <di:waypoint x="390" y="135" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0oyc1oz_di" bpmnElement="Flow_0oyc1oz">
-        <di:waypoint x="90" y="85" />
-        <di:waypoint x="90" y="10" />
-        <di:waypoint x="190" y="10" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0zqmkvl_di" bpmnElement="Flow_0zqmkvl">
-        <di:waypoint x="290" y="10" />
-        <di:waypoint x="390" y="10" />
-        <di:waypoint x="390" y="85" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0rls95r_di" bpmnElement="Flow_0rls95r">
-        <di:waypoint x="0" y="168" />
-        <di:waypoint x="0" y="280" />
-        <di:waypoint x="550" y="280" />
-        <di:waypoint x="550" y="128" />
+      <bpmndi:BPMNEdge id="Flow_1uu9ae4_di" bpmnElement="Flow_1uu9ae4">
+        <di:waypoint x="270" y="210" />
+        <di:waypoint x="310" y="210" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/playground/matplus/dan-funk/process_model.json b/playground/matplus/dan-funk/process_model.json
index 4d526243..d2657562 100644
--- a/playground/matplus/dan-funk/process_model.json
+++ b/playground/matplus/dan-funk/process_model.json
@@ -5,5 +5,5 @@
     "fault_or_suspend_on_exception": "fault",
     "metadata_extraction_paths": null,
     "primary_file_name": "dan-funk.bpmn",
-    "primary_process_id": "Process_dan_funk_5t3nhn3"
+    "primary_process_id": "Process_17itlj1"
 }
\ No newline at end of file