diff --git a/orga/planner/bestPlanEver.planner b/orga/planner/bestPlanEver.planner
index da42377..65e7cf6 100644
--- a/orga/planner/bestPlanEver.planner
+++ b/orga/planner/bestPlanEver.planner
@@ -34,124 +34,148 @@
         </predecessors>
       </task>
     </task>
-    <task id="6" name="Plannung" note="" work="662400" start="20190403T170000Z" end="20190417T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-      <task id="7" name="Grobdesign [M]" note="" work="86400" start="20190403T170000Z" end="20190410T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <task id="8" name="Architektur festlegen" note="" work="86400" start="20190403T170000Z" end="20190410T170000Z" work-start="20190406T080000Z" percent-complete="70" priority="0" type="normal" scheduling="fixed-work">
+    <task id="6" name="Plannung" note="" work="662400" start="20190403T170000Z" end="20190420T170000Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="7" name="Grobdesign [M]" note="" work="86400" start="20190403T170000Z" end="20190409T133640Z" work-start="20190406T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <task id="8" name="Architektur festlegen" note="" work="86400" start="20190403T170000Z" end="20190409T133640Z" work-start="20190406T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="5" type="FS"/>
           </predecessors>
         </task>
       </task>
-      <task id="9" name="Feindesign [M]" note="" work="460800" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <task id="10" name="3D Test auf Kotlin + ChipView Test" note="" work="86400" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="9" name="Feindesign [M]" note="" work="460800" start="20190409T133640Z" end="20190420T170000Z" work-start="20190409T133640Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <task id="10" name="3D Test auf Kotlin + ChipView Test" note="" work="86400" start="20190409T133640Z" end="20190416T133640Z" work-start="20190409T133640Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
-        <task id="11" name="Netzwerk-Protokoll definieren" note="" work="86400" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+        <task id="11" name="Netzwerk-Protokoll definieren" note="" work="86400" start="20190409T133640Z" end="20190416T133640Z" work-start="20190409T133640Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
-        <task id="12" name="Mockups" note="" work="57600" start="20190410T170000Z" end="20190416T170000Z" work-start="20190413T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+        <task id="12" name="Mockups" note="" work="57600" start="20190409T133640Z" end="20190413T133640Z" work-start="20190409T133640Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
-        <task id="13" name="Wie Metadaten filtern?" note="" work="57600" start="20190410T170000Z" end="20190416T170000Z" work-start="20190413T080000Z" percent-complete="30" priority="0" type="normal" scheduling="fixed-work">
+        <task id="13" name="Wie Metadaten filtern?" note="" work="57600" start="20190417T000000Z" end="20190420T170000Z" work-start="20190417T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="start-no-earlier-than" time="20190417T000000Z"/>
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
-        <task id="14" name="Datenerhaltung" note="" work="86400" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="90" priority="0" type="normal" scheduling="fixed-work">
+        <task id="14" name="Datenerhaltung" note="" work="86400" start="20190409T133640Z" end="20190416T133640Z" work-start="20190409T133640Z" 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="UI Elemente beschreiben" note="" work="86400" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <task id="15" name="UI Elemente beschreiben" note="" work="86400" start="20190409T133640Z" end="20190416T133640Z" work-start="20190409T133640Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
           <predecessors>
             <predecessor id="1" predecessor-id="8" type="FS"/>
           </predecessors>
         </task>
       </task>
-      <task id="16" name="Task zuweisen" note="" work="28800" start="20190410T170000Z" end="20190413T170000Z" work-start="20190413T080000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="16" name="Task zuweisen" note="" work="28800" start="20190409T133640Z" end="20190410T133640Z" work-start="20190409T133640Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="8" type="FS"/>
         </predecessors>
       </task>
-      <task id="17" name="Mastertestplan [M]" note="" work="86400" start="20190410T170000Z" end="20190417T170000Z" work-start="20190413T080000Z" percent-complete="20" priority="0" type="normal" scheduling="fixed-work">
+      <task id="17" name="Mastertestplan [M]" note="" work="86400" start="20190409T133640Z" end="20190416T133640Z" work-start="20190409T133640Z" percent-complete="20" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="8" type="FS"/>
         </predecessors>
       </task>
     </task>
-    <task id="18" name="End of Design" note="" work="0" start="20190417T170000Z" end="20190417T170000Z" work-start="20190417T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
+    <task id="18" name="End of Design" note="" work="0" start="20190416T133640Z" end="20190416T133640Z" work-start="20190416T133640Z" 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="19" name="Realisation" note="" work="720000" start="20190417T170000Z" end="20190430T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="19" name="Realisation" note="" work="1065600" start="20190423T000000Z" end="20190511T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <predecessors>
         <predecessor id="1" predecessor-id="18" type="FS"/>
       </predecessors>
-      <task id="20" name="Einrichtung von Tests" note="" work="57600" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="20" name="Einrichtung von Tests" note="" work="28800" start="20190423T000000Z" end="20190423T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="11" type="FS"/>
         </predecessors>
-        <task id="21" name="Client Tests" note="" work="28800" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-        <task id="22" name="Server Tests" note="" work="28800" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-      </task>
-      <task id="23" name="Client" note="" work="374400" start="20190417T170000Z" end="20190424T170000Z" work-start="20190420T080000Z" 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="20190417T170000Z" end="20190424T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-          <task id="25" name="Previews" note="" work="86400" start="20190417T170000Z" end="20190424T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="26" name="Filter Kontrollstrukturen" note="" work="86400" start="20190417T170000Z" end="20190424T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="27" name="3D Visualisierung" note="" work="57600" start="20190417T170000Z" end="20190423T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="28" name="Dateien hinzuf&#xFC;gen" note="" work="28800" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-          <task id="29" name="Dateien lokal abspeichern" note="" work="28800" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        <task id="21" name="Client Tests" note="" work="28800" start="20190423T000000Z" end="20190423T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="start-no-earlier-than" time="20190423T000000Z"/>
         </task>
-        <task id="30" name="Grund Architektur" note="" work="86400" start="20190417T170000Z" end="20190424T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
       </task>
-      <task id="31" name="Server" note="" work="172800" start="20190417T170000Z" end="20190430T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="22" name="Client" note="" work="547200" start="20190423T000000Z" end="20190504T170000Z" work-start="20190423T080000Z" 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="20190417T170000Z" end="20190430T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
-        <task id="33" name="Filter implementieren" note="" work="28800" start="20190417T170000Z" end="20190420T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        <task id="23" name="UI" note="" work="288000" start="20190423T170000Z" end="20190430T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <predecessors>
+            <predecessor id="1" predecessor-id="21" type="FS"/>
+          </predecessors>
+          <task id="24" name="Previews" note="" work="86400" start="20190423T170000Z" end="20190430T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="25" name="Filter UI" note="" work="86400" start="20190423T170000Z" end="20190430T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="26" name="3D Visualisierung" note="" work="57600" start="20190423T170000Z" end="20190427T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="27" name="Dateien hinzuf&#xFC;gen" note="" work="28800" start="20190423T170000Z" end="20190424T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+          <task id="28" name="Dateien lokal abspeichern" note="" work="28800" start="20190423T170000Z" end="20190424T170000Z" work-start="20190424T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
+        </task>
+        <task id="29" name="Grund Architektur" note="" work="86400" start="20190423T000000Z" end="20190427T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="start-no-earlier-than" time="20190423T000000Z"/>
+        </task>
+        <task id="30" name="Protokoll implementieren" note="" work="172800" start="20190423T000000Z" end="20190504T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="start-no-earlier-than" time="20190423T000000Z"/>
+        </task>
+      </task>
+      <task id="31" name="Server" note="" work="489600" start="20190423T000000Z" end="20190511T170000Z" work-start="20190423T080000Z" 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="172800" start="20190423T000000Z" end="20190504T170000Z" work-start="20190423T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="must-start-on" time="20190423T000000Z"/>
+        </task>
+        <task id="33" name="Protokoll implementieren" note="" work="172800" start="20190423T000000Z" end="20190504T170000Z" work-start="20190423T080000Z" percent-complete="5" priority="0" type="normal" scheduling="fixed-work">
+          <constraint type="must-start-on" time="20190423T000000Z"/>
+        </task>
+        <task id="34" name="Suche implementieren" note="" work="86400" start="20190504T170000Z" end="20190511T170000Z" work-start="20190507T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <predecessors>
+            <predecessor id="1" predecessor-id="32" type="FS"/>
+          </predecessors>
+        </task>
+        <task id="35" name="Hauptlogik implementieren" note="Haupts&#xE4;chlich Glue-Code&#10;&#10;" work="57600" start="20190504T170000Z" end="20190508T170000Z" work-start="20190507T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+          <predecessors>
+            <predecessor id="1" predecessor-id="33" type="FS"/>
+            <predecessor id="1" predecessor-id="32" type="FS"/>
+          </predecessors>
+        </task>
       </task>
-      <task id="34" name="Protokoll implementieren" note="" work="115200" start="20190417T170000Z" end="20190427T170000Z" work-start="20190420T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work"/>
     </task>
-    <task id="35" name="End of Implementation" note="" work="0" start="20190430T170000Z" end="20190430T170000Z" work-start="20190430T170000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
+    <task id="36" name="End of Implementation" note="" work="0" start="20190511T170000Z" end="20190511T170000Z" work-start="20190511T170000Z" 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="22" type="FS"/>
         <predecessor id="1" predecessor-id="20" type="FS"/>
       </predecessors>
     </task>
-    <task id="36" name="Abnahme" note="" work="374400" start="20190430T170000Z" end="20190529T170000Z" work-start="20190501T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-      <task id="37" name="Modultests [M]" note="" work="115200" start="20190430T170000Z" end="20190508T170000Z" work-start="20190501T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="37" name="Abnahme" note="" work="374400" start="20190511T170000Z" end="20190611T170000Z" work-start="20190514T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="38" name="Modultests [M]" note="" work="115200" start="20190511T170000Z" end="20190521T170000Z" work-start="20190514T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
-          <predecessor id="1" predecessor-id="35" type="FS"/>
+          <predecessor id="1" predecessor-id="36" type="FS"/>
         </predecessors>
       </task>
-      <task id="38" name="Integrationstests [M]" note="" work="115200" start="20190508T170000Z" end="20190518T170000Z" work-start="20190511T080000Z" 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="20190518T170000Z" end="20190528T170000Z" work-start="20190521T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="39" name="Integrationstests [M]" note="" work="115200" start="20190521T170000Z" end="20190529T170000Z" work-start="20190522T080000Z" 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="20190528T170000Z" end="20190529T170000Z" work-start="20190529T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="40" name="Systemtests [M]" note="" work="115200" start="20190529T170000Z" end="20190608T170000Z" work-start="20190601T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="39" type="FS"/>
         </predecessors>
       </task>
+      <task id="41" name="Akzeptanztest [M]" note="" work="28800" start="20190608T170000Z" end="20190611T170000Z" work-start="20190611T080000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <predecessors>
+          <predecessor id="1" predecessor-id="40" type="FS"/>
+        </predecessors>
+      </task>
     </task>
   </tasks>
   <resource-groups/>
@@ -162,15 +186,19 @@
     <resource id="4" name="Lukas" short-name="L" type="1" units="0" email="" note="" std-rate="0"/>
   </resources>
   <allocations>
+    <allocation task-id="33" resource-id="1" units="100"/>
+    <allocation task-id="8" resource-id="1" units="100"/>
     <allocation task-id="13" resource-id="1" units="100"/>
     <allocation task-id="11" resource-id="1" units="100"/>
     <allocation task-id="5" resource-id="1" units="50"/>
+    <allocation task-id="8" resource-id="2" units="10"/>
     <allocation task-id="17" resource-id="2" units="100"/>
     <allocation task-id="5" resource-id="2" units="50"/>
     <allocation task-id="15" resource-id="3" units="100"/>
     <allocation task-id="12" resource-id="3" units="100"/>
     <allocation task-id="10" resource-id="3" units="100"/>
-    <allocation task-id="8" resource-id="4" units="100"/>
+    <allocation task-id="14" resource-id="4" units="100"/>
+    <allocation task-id="8" resource-id="4" units="80"/>
     <allocation task-id="4" resource-id="4" units="100"/>
   </allocations>
 </project>