diff --git a/doc/planner/bestPlanEver.planner b/doc/planner/bestPlanEver.planner
index ae6d7ef..07ada47 100644
--- a/doc/planner/bestPlanEver.planner
+++ b/doc/planner/bestPlanEver.planner
@@ -34,7 +34,7 @@
         </predecessors>
       </task>
     </task>
-    <task id="6" name="Plannung" note="" work="432000" start="20190403T170000Z" end="20190413T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="6" name="Plannung" note="" work="547200" start="20190322T000000Z" end="20190413T170000Z" work-start="20190323T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <task id="7" name="Grobdesign [M]" note="" work="28800" start="20190403T170000Z" end="20190406T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <task id="8" name="Architektur festlegen" note="" work="28800" start="20190403T170000Z" end="20190406T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
@@ -42,7 +42,7 @@
           </predecessors>
         </task>
       </task>
-      <task id="9" name="Feindesign [M]" note="" work="288000" start="20190406T170000Z" end="20190413T170000Z" work-start="20190409T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="9" name="Feindesign [M]" note="" work="403200" start="20190322T000000Z" end="20190413T170000Z" work-start="20190323T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <task id="10" name="3D Test auf Kotlin + ChipView Test" note="" work="86400" start="20190406T170000Z" end="20190413T170000Z" work-start="20190409T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
@@ -63,85 +63,91 @@
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
+        <task id="14" name="Datenerhaltung" note="" work="86400" start="20190406T170000Z" end="20190413T170000Z" work-start="20190409T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <predecessors>
+            <predecessor id="1" predecessor-id="8" type="FS"/>
+          </predecessors>
+        </task>
+        <task id="15" name="UI Elemente beschreiben" note="" work="28800" start="20190322T000000Z" end="20190323T170000Z" work-start="20190323T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
       </task>
-      <task id="14" name="Task zuweisen" note="" work="28800" start="20190406T170000Z" end="20190409T170000Z" work-start="20190409T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="16" name="Task zuweisen" note="" work="28800" start="20190406T170000Z" end="20190409T170000Z" work-start="20190409T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="8" type="FS"/>
         </predecessors>
       </task>
-      <task id="15" name="Mastertestplan [M]" note="" work="86400" start="20190406T170000Z" end="20190413T170000Z" work-start="20190409T080000Z" percent-complete="20" priority="0" type="normal" scheduling="fixed-work">
+      <task id="17" name="Mastertestplan [M]" note="" work="86400" start="20190406T170000Z" end="20190413T170000Z" work-start="20190409T080000Z" percent-complete="20" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="8" type="FS"/>
         </predecessors>
       </task>
     </task>
-    <task id="16" name="End of Design" note="" work="0" start="20190413T170000Z" end="20190413T170000Z" work-start="20190413T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
+    <task id="18" name="End of Design" note="" work="0" start="20190413T170000Z" end="20190413T170000Z" work-start="20190413T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
       <predecessors>
         <predecessor id="1" predecessor-id="11" type="FS"/>
         <predecessor id="1" predecessor-id="10" type="FS"/>
       </predecessors>
     </task>
-    <task id="17" name="Realisation" note="" work="720000" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="19" name="Realisation" note="" work="720000" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <predecessors>
-        <predecessor id="1" predecessor-id="16" type="FS"/>
-      </predecessors>
-      <task id="18" name="Einrichtung von Tests" note="" work="57600" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <predecessors>
-          <predecessor id="1" predecessor-id="11" type="FS"/>
-        </predecessors>
-        <task id="19" name="Client Tests" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-        <task id="20" name="Server Tests" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-      </task>
-      <task id="21" name="Client" note="" work="374400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <predecessors>
-          <predecessor id="1" predecessor-id="11" type="FS"/>
-        </predecessors>
-        <task id="22" name="UI" note="" work="288000" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-          <task id="23" name="Previews" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="24" name="Filter Kontrollstrukturen" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="25" name="3D Visualisierung" note="" work="57600" start="20190413T170000Z" end="20190417T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="26" name="Dateien hinzuf&#xFC;gen" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="27" name="Dateien lokal abspeichern" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-        </task>
-        <task id="28" name="Grund Architektur" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-      </task>
-      <task id="29" name="Server" note="" work="172800" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <predecessors>
-          <predecessor id="1" predecessor-id="11" type="FS"/>
-        </predecessors>
-        <task id="30" name="Dateien speichern/verwalten" note="" work="144000" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-        <task id="31" name="Filter implementieren" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-      </task>
-      <task id="32" name="Protokoll implementieren" note="" work="115200" start="20190413T170000Z" end="20190423T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-    </task>
-    <task id="33" name="End of Implementation" note="" work="0" start="20190424T170000Z" end="20190424T170000Z" work-start="20190424T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
-      <predecessors>
-        <predecessor id="1" predecessor-id="29" type="FS"/>
-        <predecessor id="1" predecessor-id="21" type="FS"/>
         <predecessor id="1" predecessor-id="18" type="FS"/>
       </predecessors>
-    </task>
-    <task id="34" name="Abnahme" note="" work="374400" start="20190424T170000Z" end="20190525T170000Z" work-start="20190427T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-      <task id="35" name="Modultests [M]" note="" work="115200" start="20190424T170000Z" end="20190504T170000Z" work-start="20190427T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="20" name="Einrichtung von Tests" note="" work="57600" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
-          <predecessor id="1" predecessor-id="33" type="FS"/>
+          <predecessor id="1" predecessor-id="11" type="FS"/>
         </predecessors>
+        <task id="21" name="Client Tests" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        <task id="22" name="Server Tests" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
       </task>
-      <task id="36" name="Integrationstests [M]" note="" work="115200" start="20190504T170000Z" end="20190514T170000Z" work-start="20190507T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="23" name="Client" note="" work="374400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <predecessors>
+          <predecessor id="1" predecessor-id="11" type="FS"/>
+        </predecessors>
+        <task id="24" name="UI" note="" work="288000" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <task id="25" name="Previews" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="26" name="Filter Kontrollstrukturen" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="27" name="3D Visualisierung" note="" work="57600" start="20190413T170000Z" end="20190417T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="28" name="Dateien hinzuf&#xFC;gen" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="29" name="Dateien lokal abspeichern" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        </task>
+        <task id="30" name="Grund Architektur" note="" work="86400" start="20190413T170000Z" end="20190420T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+      </task>
+      <task id="31" name="Server" note="" work="172800" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <predecessors>
+          <predecessor id="1" predecessor-id="11" type="FS"/>
+        </predecessors>
+        <task id="32" name="Dateien speichern/verwalten" note="" work="144000" start="20190413T170000Z" end="20190424T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        <task id="33" name="Filter implementieren" note="" work="28800" start="20190413T170000Z" end="20190416T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+      </task>
+      <task id="34" name="Protokoll implementieren" note="" work="115200" start="20190413T170000Z" end="20190423T170000Z" work-start="20190416T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+    </task>
+    <task id="35" name="End of Implementation" note="" work="0" start="20190424T170000Z" end="20190424T170000Z" work-start="20190424T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
+      <predecessors>
+        <predecessor id="1" predecessor-id="31" type="FS"/>
+        <predecessor id="1" predecessor-id="23" type="FS"/>
+        <predecessor id="1" predecessor-id="20" type="FS"/>
+      </predecessors>
+    </task>
+    <task id="36" name="Abnahme" note="" work="374400" start="20190424T170000Z" end="20190525T170000Z" work-start="20190427T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="37" name="Modultests [M]" note="" work="115200" start="20190424T170000Z" end="20190504T170000Z" work-start="20190427T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="35" type="FS"/>
         </predecessors>
       </task>
-      <task id="37" name="Systemtests [M]" note="" work="115200" start="20190514T170000Z" end="20190522T170000Z" work-start="20190515T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <predecessors>
-          <predecessor id="1" predecessor-id="36" type="FS"/>
-        </predecessors>
-      </task>
-      <task id="38" name="Akzeptanztest [M]" note="" work="28800" start="20190522T170000Z" end="20190525T170000Z" work-start="20190525T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="38" name="Integrationstests [M]" note="" work="115200" start="20190504T170000Z" end="20190514T170000Z" work-start="20190507T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="37" type="FS"/>
         </predecessors>
       </task>
+      <task id="39" name="Systemtests [M]" note="" work="115200" start="20190514T170000Z" end="20190522T170000Z" work-start="20190515T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <predecessors>
+          <predecessor id="1" predecessor-id="38" type="FS"/>
+        </predecessors>
+      </task>
+      <task id="40" name="Akzeptanztest [M]" note="" work="28800" start="20190522T170000Z" end="20190525T170000Z" work-start="20190525T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <predecessors>
+          <predecessor id="1" predecessor-id="39" type="FS"/>
+        </predecessors>
+      </task>
     </task>
   </tasks>
   <resource-groups/>
@@ -153,9 +159,9 @@
   </resources>
   <allocations>
     <allocation task-id="13" resource-id="1" units="100"/>
-    <allocation task-id="5" resource-id="1" units="50"/>
     <allocation task-id="11" resource-id="1" units="100"/>
-    <allocation task-id="15" resource-id="2" units="100"/>
+    <allocation task-id="5" resource-id="1" units="50"/>
+    <allocation task-id="17" resource-id="2" units="100"/>
     <allocation task-id="5" resource-id="2" units="50"/>
     <allocation task-id="12" resource-id="3" units="100"/>
     <allocation task-id="10" resource-id="3" units="100"/>