diff --git a/plan.planner b/plan.planner
index afd54d2..27bb0f3 100644
--- a/plan.planner
+++ b/plan.planner
@@ -28,7 +28,7 @@
         <constraint type="must-start-on" time="20191023T000000Z"/>
       </task>
     </task>
-    <task id="3" name="Lastenheft" note="" work="295920" start="20191023T000000Z" end="20191120T210000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="3" name="Lastenheft" note="" work="378000" start="20191023T000000Z" end="20191203T210000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20191211T000000Z"/>
       <task id="4" name="Dokumenten Koordinierung" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191023T000000Z"/>
@@ -78,21 +78,16 @@
           <predecessor id="1" predecessor-id="4" type="FS"/>
         </predecessors>
       </task>
-      <task id="16" name="&#xDC;berarbeitung Teil 1, Flussdiagramme" note="" work="47520" start="20191105T210000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="50" priority="0" type="normal" scheduling="fixed-work">
+      <task id="16" name="&#xDC;berarbeitung Teil 1, Flussdiagramme" note="" work="86400" start="20191105T210000Z" end="20191120T202500Z" work-start="20191106T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="15" type="FS"/>
         </predecessors>
       </task>
-      <task id="17" name="Produkrisiken" note="" work="21600" start="20191105T210000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <predecessors>
-          <predecessor id="1" predecessor-id="15" type="FS"/>
-        </predecessors>
+      <task id="17" name="Buchhaltung" note="" work="43200" start="20191120T000000Z" end="20191203T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="must-start-on" time="20191120T000000Z"/>
       </task>
-      <task id="18" name="Abgrenzungskriterien" note="" work="21600" start="20191113T000000Z" end="20191120T210000Z" work-start="20191113T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <constraint type="start-no-earlier-than" time="20191113T000000Z"/>
-        <predecessors>
-          <predecessor id="1" predecessor-id="15" type="FS"/>
-        </predecessors>
+      <task id="18" name="NF Anforderungen &#xFC;berarbeiten" note="" work="43200" start="20191120T000000Z" end="20191203T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191120T000000Z"/>
       </task>
     </task>
     <task id="19" name="Glossar" note="" work="21600" start="20191106T000000Z" end="20191112T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
@@ -101,12 +96,12 @@
         <constraint type="start-no-earlier-than" time="20191106T000000Z"/>
       </task>
     </task>
-    <task id="21" name="GUI Prototyp / Storyboards" note="" work="86400" start="20191023T000000Z" end="20191123T210000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="21" name="GUI Prototyp / Storyboards" note="" work="129600" start="20191023T000000Z" end="20191205T201000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200212T000000Z"/>
       <task id="22" name="Webframework Technologie Recherche" note="" work="43200" start="20191023T000000Z" end="20191113T201000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191023T000000Z"/>
       </task>
-      <task id="23" name="Projekt Setup / Mini-Prototyp" note="" work="21600" start="20191113T201000Z" end="20191121T201000Z" work-start="20191113T201000Z" percent-complete="10" priority="0" type="normal" scheduling="fixed-work">
+      <task id="23" name="Projekt Setup / Mini-Prototyp" note="" work="64800" start="20191113T201000Z" end="20191205T201000Z" work-start="20191113T201000Z" percent-complete="35" priority="0" type="normal" scheduling="fixed-work">
         <predecessors>
           <predecessor id="1" predecessor-id="22" type="FS"/>
         </predecessors>
@@ -115,52 +110,78 @@
         <constraint type="start-no-earlier-than" time="20191106T000000Z"/>
       </task>
     </task>
-    <task id="25" name="Risikoanalyse" note="" work="86400" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="25" name="Risikoanalyse" note="" work="108000" start="20191106T000000Z" end="20191127T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200212T000000Z"/>
-      <task id="26" name="Anlegen und beginnen [TODO Subtasks]" note="" work="86400" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="26" name="Produktrisiken: Lagerverwaltung + Algemein" note="" work="21600" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191106T000000Z"/>
       </task>
+      <task id="27" name="Projektrisiken" note="" work="21600" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191106T000000Z"/>
+      </task>
+      <task id="28" name="Produktrisiken:  Kundenverwaltung, Lieferverwaltung, Artikelverwaltung" note="" work="64800" start="20191106T000000Z" end="20191127T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="must-start-on" time="20191106T000000Z"/>
+      </task>
     </task>
-    <task id="27" name="Projektplan" note="" work="32400" start="20191023T000000Z" end="20191120T210000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="29" name="Projektplan" note="" work="32400" start="20191023T000000Z" end="20191120T210000Z" work-start="20191023T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200212T000000Z"/>
-      <task id="28" name="Plan &#xFC;berarbeiten (Gnome Planner)" note="" work="21600" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="30" name="Plan &#xFC;berarbeiten (Gnome Planner)" note="" work="21600" start="20191106T000000Z" end="20191120T210000Z" work-start="20191106T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191106T000000Z"/>
       </task>
-      <task id="29" name="Recherche: Projektplannungssoftware" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="31" name="Recherche: Projektplannungssoftware" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="must-start-on" time="20191023T000000Z"/>
       </task>
     </task>
-    <task id="30" name="Pflichtenheft" note="" work="115200" start="20191105T210000Z" end="20191203T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="32" name="Pflichtenheft" note="" work="194400" start="20191113T000000Z" end="20191217T210000Z" work-start="20191113T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200311T000000Z"/>
-      <task id="31" name="Vorbereiten, Mit Vorlage vergleichen" note="" work="28800" start="20191105T210000Z" end="20191125T210000Z" work-start="20191106T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="33" name="Vorbereiten, Mit Vorlage vergleichen" note="" work="21600" start="20191120T000000Z" end="20191126T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191120T000000Z"/>
         <predecessors>
           <predecessor id="1" predecessor-id="15" type="FS"/>
         </predecessors>
       </task>
-      <task id="32" name="Muss-Kritierien von LH ableiten" note="" work="43200" start="20191120T000000Z" end="20191203T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-        <constraint type="must-start-on" time="20191120T000000Z"/>
-      </task>
-      <task id="33" name="Wunsch Kriterien von LH ableiten" note="" work="43200" start="20191120T000000Z" end="20191203T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="34" name="Muss-Kritierien von LH ableiten" note="" work="43200" start="20191126T210000Z" end="20191210T210000Z" work-start="20191127T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191120T000000Z"/>
+        <predecessors>
+          <predecessor id="1" predecessor-id="33" type="FS"/>
+        </predecessors>
+      </task>
+      <task id="35" name="Wunsch Kriterien von LH ableiten" note="" work="43200" start="20191127T000000Z" end="20191210T210000Z" work-start="20191127T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191127T000000Z"/>
+      </task>
+      <task id="36" name="Abgrenzungskriterien" note="" work="43200" start="20191113T000000Z" end="20191127T210000Z" work-start="20191113T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191113T000000Z"/>
+        <predecessors>
+          <predecessor id="1" predecessor-id="15" type="FS"/>
+        </predecessors>
+      </task>
+      <task id="37" name="Produkrisiken" note="" work="43200" start="20191204T000000Z" end="20191217T210000Z" work-start="20191204T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+        <constraint type="start-no-earlier-than" time="20191204T000000Z"/>
+        <predecessors>
+          <predecessor id="1" predecessor-id="16" type="FS"/>
+          <predecessor id="1" predecessor-id="15" type="FS"/>
+        </predecessors>
       </task>
     </task>
-    <task id="34" name="Mastertestplan" note="" work="0" start="20200311T000000Z" end="20200311T000000Z" work-start="20200311T200000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
+    <task id="38" name="Mastertestplan" note="" work="0" start="20200311T000000Z" end="20200311T000000Z" work-start="20200311T200000Z" percent-complete="0" priority="0" type="milestone" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200311T000000Z"/>
     </task>
-    <task id="35" name="Systemtests" note="" work="43200" start="20191211T000000Z" end="20191224T210000Z" work-start="20191211T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+    <task id="39" name="Systemtests" note="" work="43200" start="20191211T000000Z" end="20191224T210000Z" work-start="20191211T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
       <constraint type="must-start-on" time="20200311T000000Z"/>
-      <task id="36" name="Recherche: Teststategie f&#xFC;r Webapps " note="" work="43200" start="20191211T000000Z" end="20191224T210000Z" work-start="20191211T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="40" name="Recherche: Teststategie f&#xFC;r Webapps " note="" work="43200" start="20191211T000000Z" end="20191224T210000Z" work-start="20191211T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191211T000000Z"/>
       </task>
     </task>
-    <task id="37" name="Orga" note="" work="32400" start="20191019T000000Z" end="20191105T210000Z" work-start="20191019T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
-      <task id="38" name="Infrastruktur und Wiki einrichten" note="" work="10800" start="20191019T000000Z" end="20191020T210000Z" work-start="20191019T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+    <task id="41" name="Systemtest vorbereiten" note="" work="43200" start="20191120T000000Z" end="20191203T210000Z" work-start="20191120T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <constraint type="start-no-earlier-than" time="20191120T000000Z"/>
+    </task>
+    <task id="42" name="Orga" note="" work="32400" start="20191019T000000Z" end="20191105T210000Z" work-start="20191019T200000Z" percent-complete="0" priority="0" type="normal" scheduling="fixed-work">
+      <task id="43" name="Infrastruktur und Wiki einrichten" note="" work="10800" start="20191019T000000Z" end="20191020T210000Z" work-start="20191019T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="must-start-on" time="20191016T000000Z"/>
       </task>
-      <task id="39" name="Templates anlegen f&#xFC;r Google Doc" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="44" name="Templates anlegen f&#xFC;r Google Doc" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="start-no-earlier-than" time="20191023T000000Z"/>
       </task>
-      <task id="40" name="Recherche zu Code Formatter" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
+      <task id="45" name="Recherche zu Code Formatter" note="" work="10800" start="20191023T000000Z" end="20191105T210000Z" work-start="20191023T200000Z" percent-complete="100" priority="0" type="normal" scheduling="fixed-work">
         <constraint type="must-start-on" time="20191023T000000Z"/>
       </task>
     </task>
@@ -176,31 +197,35 @@
     <resource id="7" name="Jannik" short-name="" type="1" units="0" email="" note="" std-rate="0"/>
   </resources>
   <allocations>
-    <allocation task-id="29" resource-id="1" units="25"/>
-    <allocation task-id="28" resource-id="1" units="50"/>
+    <allocation task-id="17" resource-id="1" units="100"/>
+    <allocation task-id="31" resource-id="1" units="25"/>
+    <allocation task-id="30" resource-id="1" units="50"/>
     <allocation task-id="24" resource-id="1" units="40"/>
     <allocation task-id="16" resource-id="1" units="10"/>
     <allocation task-id="7" resource-id="1" units="50"/>
-    <allocation task-id="39" resource-id="1" units="25"/>
-    <allocation task-id="32" resource-id="2" units="100"/>
-    <allocation task-id="16" resource-id="2" units="50"/>
-    <allocation task-id="31" resource-id="2" units="50"/>
+    <allocation task-id="44" resource-id="1" units="25"/>
+    <allocation task-id="34" resource-id="2" units="100"/>
+    <allocation task-id="16" resource-id="2" units="100"/>
+    <allocation task-id="33" resource-id="2" units="100"/>
     <allocation task-id="9" resource-id="2" units="50"/>
     <allocation task-id="8" resource-id="2" units="50"/>
-    <allocation task-id="40" resource-id="3" units="25"/>
-    <allocation task-id="33" resource-id="3" units="100"/>
+    <allocation task-id="45" resource-id="3" units="25"/>
+    <allocation task-id="35" resource-id="3" units="100"/>
     <allocation task-id="20" resource-id="3" units="100"/>
-    <allocation task-id="18" resource-id="3" units="100"/>
+    <allocation task-id="36" resource-id="3" units="100"/>
     <allocation task-id="4" resource-id="3" units="25"/>
-    <allocation task-id="16" resource-id="4" units="50"/>
-    <allocation task-id="17" resource-id="4" units="50"/>
+    <allocation task-id="18" resource-id="4" units="100"/>
+    <allocation task-id="16" resource-id="4" units="100"/>
+    <allocation task-id="37" resource-id="4" units="100"/>
     <allocation task-id="14" resource-id="4" units="50"/>
     <allocation task-id="13" resource-id="4" units="50"/>
-    <allocation task-id="38" resource-id="4" units="150"/>
+    <allocation task-id="43" resource-id="4" units="150"/>
+    <allocation task-id="28" resource-id="5" units="100"/>
     <allocation task-id="11" resource-id="5" units="50"/>
-    <allocation task-id="26" resource-id="5" units="100"/>
     <allocation task-id="12" resource-id="5" units="50"/>
-    <allocation task-id="26" resource-id="6" units="100"/>
+    <allocation task-id="41" resource-id="6" units="100"/>
+    <allocation task-id="27" resource-id="6" units="50"/>
+    <allocation task-id="26" resource-id="6" units="50"/>
     <allocation task-id="10" resource-id="6" units="34"/>
     <allocation task-id="6" resource-id="6" units="34"/>
     <allocation task-id="5" resource-id="6" units="34"/>