diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33fa0d60..863e90a4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,22 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5cf612a7-261d-49e6-bf7a-db4b05e41151" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" afterPath="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" afterPath="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java" afterPath="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav" afterPath="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav" />
     </list>
     <ignored path="$PROJECT_DIR$/bin/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -25,11 +33,23 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="Construct.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="130" column="49" lean-forward="false" selection-start-line="130" selection-start-column="49" selection-end-line="130" selection-end-column="49" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="Type.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="369">
-              <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+            <state relative-caret-position="279">
+              <caret line="27" column="29" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -37,41 +57,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Class2StringTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java">
+      <file leaf-file-name="TypeExpr.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="762">
-              <caret line="79" column="62" lean-forward="false" selection-start-line="79" selection-start-column="62" selection-end-line="79" selection-end-column="62" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TypeExprTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="NewOperatorTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="71">
-              <caret line="32" column="23" lean-forward="true" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TI.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="20" column="50" lean-forward="false" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="50" />
+            <state relative-caret-position="262">
+              <caret line="104" column="74" lean-forward="true" selection-start-line="104" selection-start-column="74" selection-end-line="104" selection-end-column="74" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -79,11 +69,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Construct.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
+      <file leaf-file-name="MappingAltNeu.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="35" column="56" lean-forward="false" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
+            <state relative-caret-position="531">
+              <caret line="39" column="14" lean-forward="false" selection-start-line="39" selection-start-column="14" selection-end-line="39" selection-end-column="14" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -91,53 +81,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AssumptionMakerGlobal.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="47" column="8" lean-forward="true" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AssumptionClass.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
-              <caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1158#1159#0" expanded="true" />
-                <element signature="e#1183#1184#0" expanded="true" />
-                <element signature="e#1229#1230#0" expanded="true" />
-                <element signature="e#1257#1258#0" expanded="true" />
-                <element signature="e#1302#1303#0" expanded="true" />
-                <element signature="e#1337#1338#0" expanded="true" />
-                <element signature="e#1399#1400#0" expanded="true" />
-                <element signature="e#1447#1448#0" expanded="true" />
-                <element signature="e#1498#1499#0" expanded="true" />
-                <element signature="e#1536#1537#0" expanded="true" />
-                <element signature="e#1607#1608#0" expanded="true" />
-                <element signature="e#1661#1662#0" expanded="true" />
-                <element signature="e#1717#1718#0" expanded="true" />
-                <element signature="e#1751#1752#0" expanded="true" />
-                <element signature="e#1823#1824#0" expanded="true" />
-                <element signature="e#1869#1870#0" expanded="true" />
-                <element signature="e#1931#1932#0" expanded="true" />
-                <element signature="e#1973#1974#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="AssumptionMap.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="219">
-              <caret line="79" column="39" lean-forward="false" selection-start-line="79" selection-start-column="39" selection-end-line="79" selection-end-column="39" />
+            <state relative-caret-position="222">
+              <caret line="80" column="5" lean-forward="true" selection-start-line="80" selection-start-column="5" selection-end-line="80" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#2501#2502#0" expanded="true" />
@@ -147,6 +95,48 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="ConstraintSubType.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="480">
+              <caret line="41" column="58" lean-forward="true" selection-start-line="41" selection-start-column="58" selection-end-line="41" selection-end-column="58" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TI.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="385">
+              <caret line="55" column="47" lean-forward="false" selection-start-line="55" selection-start-column="47" selection-end-line="55" selection-end-column="47" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="NewOperatorTest2.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="37" column="39" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="NewOperatorTest2.jav" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.jav">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="37" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -163,6 +153,13 @@
       <find>getTypeVa</find>
       <find>Expres</find>
       <find>Interface</find>
+      <find>interface</find>
+      <find>isInterfac</find>
+      <find>Gener</find>
+      <find>ConstraintS</find>
+      <find>Constraint</find>
+      <find>getClass</find>
+      <find>methodCa</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -176,23 +173,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/strucTypes2/FindAssumptions.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/Interface.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes2/Assumptions_Map.java" />
-        <option value="$PROJECT_DIR$/src/control/Main.java" />
-        <option value="$PROJECT_DIR$/test/strucTypes3/GeneralParserTestNeuX.java" />
-        <option value="$PROJECT_DIR$/test/strucTypes3/StructuralTypesSimpleSkript.jav" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Main.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Start.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/GenericOut.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Walk.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ToCode.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/WalkTrough.java" />
         <option value="$PROJECT_DIR$/test/strucTypes5/AssumptionTest.jav" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/AssumptionMaker.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/AssumptionMakerGlobal.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/AssumptionMakerLokal.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Assumptions/AssumptionField.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Assumptions/AssumptionMakerGlobal.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/Assumptions/AssumptionArgument.java" />
@@ -204,24 +189,41 @@
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/SubTypeConstraint.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/ClassWithTPH2String.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2Code.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintField.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintMethod.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java" />
-        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" />
         <option value="$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java" />
         <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java" />
         <option value="$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java" />
-        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/ConstructTest.jav" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/factoryForSyntaxtree/FactoryForElementes.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/GenericNames.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/ConstructTest.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/InterfaceTemplates/MethodInterface.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/MethodInterface.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java" />
         <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/ConstructInterfaceTemplates.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.java" />
+        <option value="$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.jav" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/OldConstraints.java" />
+        <option value="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java" />
       </list>
     </option>
   </component>
@@ -275,6 +277,38 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="strucTypes5" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="JavaCompilerCore" />
@@ -325,7 +359,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="parser" />
+              <option name="myItemId" value="strucTypes5" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -347,11 +381,51 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="parser" />
+              <option name="myItemId" value="strucTypes5" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="SyntaxTreeGenerator" />
+              <option name="myItemId" value="typeVars" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dhbwstuttgart" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="strucTypes5" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="constraints" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="JavaCompilerCore" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="doc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -380,66 +454,17 @@
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="strucTypes5" />
+      <recent name="de.dhbwstuttgart.strucTypes5.algo" />
       <recent name="strucTypes3" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/test/strucTypes5" />
+      <recent name="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars" />
+      <recent name="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates" />
       <recent name="$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.NewOperatorTest.run">
-    <configuration default="false" name="AssumptionTest.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="strucTypes5.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="JavaCompilerCore" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="strucTypes5" />
-      <option name="MAIN_CLASS_NAME" value="strucTypes5.AssumptionTest" />
-      <option name="METHOD_NAME" value="run" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="false" name="Class2StringTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="strucTypes5.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="JavaCompilerCore" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="strucTypes5" />
-      <option name="MAIN_CLASS_NAME" value="strucTypes5.Class2StringTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
+  <component name="RunManager" selected="JUnit.NewOperatorTest2.run">
     <configuration default="false" name="TypeExprTest.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -518,6 +543,58 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="false" name="ConstructTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="strucTypes5.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="JavaCompilerCore" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="strucTypes5" />
+      <option name="MAIN_CLASS_NAME" value="strucTypes5.ConstructTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
+    <configuration default="false" name="NewOperatorTest2.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="strucTypes5.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="JavaCompilerCore" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="strucTypes5" />
+      <option name="MAIN_CLASS_NAME" value="strucTypes5.NewOperatorTest2" />
+      <option name="METHOD_NAME" value="run" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -899,19 +976,19 @@
       <method />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.ConstructTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.NewOperatorTest2.run" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.Class2StringTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.AssumptionTest.run" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.NewOperatorTest2.run" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.ConstructTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.NewOperatorTest.run" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.Class2StringTest.run" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.TypeExprTest.run" />
       </list>
     </recent_temporary>
   </component>
@@ -929,44 +1006,44 @@
       <option name="presentableId" value="Default" />
       <updated>1492600650522</updated>
       <workItem from="1492600653626" duration="3746000" />
-      <workItem from="1492623646935" duration="53529000" />
+      <workItem from="1492623646935" duration="84228000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="Class2StringTest_run - 2017.04.21 at 02h 08m 55s.xml">
-      <configuration name="Class2StringTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 03m 45s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 09m 27s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 15m 38s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 10m 30s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 23m 08s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 15m 23s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 25m 26s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 15m 56s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 26m 31s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 18m 26s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 27m 56s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 19m 39s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 28m 35s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 01h 20m 42s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 31m 14s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="NewOperatorTest_run - 2017.04.21 at 02h 09m 12s.xml">
-      <configuration name="NewOperatorTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 34m 39s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TypeExprTest_run - 2017.04.21 at 02h 08m 40s.xml">
-      <configuration name="TypeExprTest.run" configurationId="JUnit" />
+    <history-entry file="NewOperatorTest2_run - 2017.04.22 at 03h 36m 36s.xml">
+      <configuration name="NewOperatorTest2.run" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="57275000" />
+    <option name="totallyTimeSpent" value="87974000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1442" height="863" extended-state="0" />
@@ -985,7 +1062,7 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15183246" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37041885" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -1029,10 +1106,10 @@
           <url>file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java</url>
           <line>46</line>
           <properties />
-          <option name="timeStamp" value="5" />
+          <option name="timeStamp" value="14" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="6" />
+      <option name="time" value="16" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1041,39 +1118,226 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintAbstract.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/FieldConstraint.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="42" lean-forward="true" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+        <state relative-caret-position="-96">
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/TypeExpr.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3845">
+          <caret line="46" column="27" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/AssumptionGenerator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="16" column="63" lean-forward="false" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/ConstraintAbstract.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes/REPL.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/Field.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="95" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
+          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/Method.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="41">
+          <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="71" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/type/RefType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="28" column="42" lean-forward="false" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-469">
           <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintField.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="240">
+          <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintGleich.java">
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/AssumptionTest.jav">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintMethod.java">
+    <entry file="jar:///opt/Oracle_Java/jdk1.8.0_102/jre/lib/rt.jar!/sun/reflect/DelegatingMethodAccessorImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="77">
+          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/parser/NullToken.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#235#236#0" expanded="false" />
+            <element signature="e#260#261#0" expanded="false" />
+            <element signature="e#302#303#0" expanded="false" />
+            <element signature="e#326#327#0" expanded="false" />
+            <element signature="e#368#369#0" expanded="false" />
+            <element signature="e#392#393#0" expanded="false" />
+            <element signature="e#448#449#0" expanded="false" />
+            <element signature="e#472#473#0" expanded="false" />
+            <element signature="e#517#518#0" expanded="false" />
+            <element signature="e#541#542#0" expanded="false" />
+            <element signature="e#589#590#0" expanded="false" />
+            <element signature="e#613#614#0" expanded="false" />
+            <element signature="e#661#662#0" expanded="false" />
+            <element signature="e#685#686#0" expanded="false" />
+            <element signature="e#732#733#0" expanded="false" />
+            <element signature="e#756#757#0" expanded="false" />
+            <element signature="e#813#814#0" expanded="false" />
+            <element signature="e#840#841#0" expanded="false" />
+            <element signature="e#896#897#0" expanded="false" />
+            <element signature="e#923#924#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/GenericContext.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="11" lean-forward="false" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/typecheck/GenericTypeName.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/GenericNames.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+          <folding>
+            <element signature="e#223#224#0" expanded="false" />
+            <element signature="e#282#283#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/ConstructTest.jav">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/typecheck/JavaClassName.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="19" column="11" lean-forward="false" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-51">
+          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/factoryForSyntaxtree/FactoryForElementes.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/MethodInterface.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
@@ -1081,15 +1345,55 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintSubType.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/Interface.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="-135">
+          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/ConstraintSubTypeInterface.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1614">
+          <caret line="137" column="0" lean-forward="false" selection-start-line="137" selection-start-column="0" selection-end-line="137" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/Construct.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="34" column="32" lean-forward="false" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/Construct2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1470">
+          <caret line="114" column="6" lean-forward="false" selection-start-line="114" selection-start-column="6" selection-end-line="114" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/syntaxtree/FieldInterface.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
           <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
@@ -1097,247 +1401,150 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/InformationTuple.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes4/algo/MakeAss.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/AssTuple.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/AssumptionTest.jav">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="14" lean-forward="false" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarAbstract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionAbstract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionArgument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="34" column="49" lean-forward="false" selection-start-line="34" selection-start-column="49" selection-end-line="34" selection-end-column="49" />
+        <state relative-caret-position="135">
+          <caret line="15" column="9" lean-forward="false" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#794#795#0" expanded="true" />
-            <element signature="e#831#832#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMethod.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#623#624#0" expanded="true" />
-            <element signature="e#650#651#0" expanded="true" />
-            <element signature="e#690#691#0" expanded="true" />
-            <element signature="e#722#723#0" expanded="true" />
-            <element signature="e#765#766#0" expanded="true" />
-            <element signature="e#797#798#0" expanded="true" />
-            <element signature="e#854#855#0" expanded="true" />
-            <element signature="e#896#897#0" expanded="true" />
-            <element signature="e#934#935#0" expanded="true" />
-            <element signature="e#967#968#0" expanded="true" />
-            <element signature="e#1020#1021#0" expanded="true" />
-            <element signature="e#1064#1065#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes3/GeneralParserTestNeuX.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-336">
-          <caret line="28" column="13" lean-forward="false" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/AssumptionTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="51" column="83" lean-forward="false" selection-start-line="51" selection-start-column="83" selection-end-line="51" selection-end-column="83" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="609">
-          <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+        <state relative-caret-position="225">
+          <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionField.java">
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/ConstructTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="56" lean-forward="false" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
-          <folding>
-            <element signature="e#480#481#0" expanded="true" />
-            <element signature="e#507#508#0" expanded="true" />
-            <element signature="e#547#548#0" expanded="true" />
-            <element signature="e#579#580#0" expanded="true" />
-            <element signature="e#614#615#0" expanded="true" />
-            <element signature="e#644#645#0" expanded="true" />
-            <element signature="e#691#692#0" expanded="true" />
-            <element signature="e#729#730#0" expanded="true" />
-            <element signature="e#775#776#0" expanded="true" />
-            <element signature="e#852#853#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerLocal.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="354">
-          <caret line="24" column="4" lean-forward="false" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
+        <state relative-caret-position="161">
+          <caret line="35" column="13" lean-forward="false" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#839#840#0" expanded="true" />
-            <element signature="e#882#883#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="20" lean-forward="false" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
+        <state relative-caret-position="161">
+          <caret line="16" column="11" lean-forward="false" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="44" column="71" lean-forward="false" selection-start-line="44" selection-start-column="71" selection-end-line="44" selection-end-column="71" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2Code.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/ConstructInterfaceTemplates.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="210">
+          <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="130" column="49" lean-forward="false" selection-start-line="130" selection-start-column="49" selection-end-line="130" selection-end-column="49" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="87" column="4" lean-forward="false" selection-start-line="87" selection-start-column="4" selection-end-line="87" selection-end-column="4" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1415#1416#0" expanded="true" />
+            <element signature="e#1440#1441#0" expanded="true" />
+            <element signature="e#1486#1487#0" expanded="true" />
+            <element signature="e#1514#1515#0" expanded="true" />
+            <element signature="e#1559#1560#0" expanded="true" />
+            <element signature="e#1594#1595#0" expanded="true" />
+            <element signature="e#1656#1657#0" expanded="true" />
+            <element signature="e#1704#1705#0" expanded="true" />
+            <element signature="e#1751#1752#0" expanded="true" />
+            <element signature="e#1787#1788#0" expanded="true" />
+            <element signature="e#1852#1853#0" expanded="true" />
+            <element signature="e#1902#1903#0" expanded="true" />
+            <element signature="e#1958#1959#0" expanded="true" />
+            <element signature="e#1992#1993#0" expanded="true" />
+            <element signature="e#2064#2065#0" expanded="true" />
+            <element signature="e#2110#2111#0" expanded="true" />
+            <element signature="e#2165#2166#0" expanded="true" />
+            <element signature="e#2207#2208#0" expanded="true" />
+            <element signature="e#2406#2407#0" expanded="true" />
+            <element signature="e#2445#2446#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="69" column="39" lean-forward="true" selection-start-line="69" selection-start-column="39" selection-end-line="69" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes3/ToStringGenerator.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="18" column="67" lean-forward="false" selection-start-line="18" selection-start-column="67" selection-end-line="18" selection-end-column="67" />
+        <state relative-caret-position="279">
+          <caret line="27" column="29" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java">
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="37" column="39" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest2.jav">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="6" column="22" lean-forward="false" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintAbstract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="31" lean-forward="false" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintMethod.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state relative-caret-position="385">
+          <caret line="55" column="47" lean-forward="false" selection-start-line="55" selection-start-column="47" selection-end-line="55" selection-end-column="47" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1346,106 +1553,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="34" column="4" lean-forward="false" selection-start-line="34" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
-          <folding>
-            <element signature="e#627#628#0" expanded="true" />
-            <element signature="e#657#658#0" expanded="true" />
-            <element signature="e#704#705#0" expanded="true" />
-            <element signature="e#742#743#0" expanded="true" />
-            <element signature="e#779#780#0" expanded="true" />
-            <element signature="e#811#812#0" expanded="true" />
-            <element signature="e#862#863#0" expanded="true" />
-            <element signature="e#904#905#0" expanded="true" />
-            <element signature="e#951#952#0" expanded="true" />
-            <element signature="e#1042#1043#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintField.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="56" lean-forward="false" selection-start-line="8" selection-start-column="56" selection-end-line="8" selection-end-column="56" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-60">
-          <caret line="33" column="18" lean-forward="false" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="18" />
+        <state relative-caret-position="480">
+          <caret line="41" column="58" lean-forward="true" selection-start-line="41" selection-start-column="58" selection-end-line="41" selection-end-column="58" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="46" column="114" lean-forward="false" selection-start-line="46" selection-start-column="114" selection-end-line="46" selection-end-column="114" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubTypeGeneric.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="72" lean-forward="false" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
-          <folding>
-            <element signature="e#391#392#0" expanded="true" />
-            <element signature="e#421#422#0" expanded="true" />
-            <element signature="e#463#464#0" expanded="true" />
-            <element signature="e#501#502#0" expanded="true" />
-            <element signature="e#533#534#0" expanded="true" />
-            <element signature="e#565#566#0" expanded="true" />
-            <element signature="e#611#612#0" expanded="true" />
-            <element signature="e#653#654#0" expanded="true" />
-            <element signature="e#699#700#0" expanded="true" />
-            <element signature="e#790#791#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.jav">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/ausgabe/Class2String.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="177" column="34" lean-forward="false" selection-start-line="177" selection-start-column="34" selection-end-line="177" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#5071#5072#0" expanded="true" />
-            <element signature="e#5111#5112#0" expanded="true" />
-            <element signature="e#5156#5157#0" expanded="true" />
-            <element signature="e#5191#5192#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="79" column="39" lean-forward="false" selection-start-line="79" selection-start-column="39" selection-end-line="79" selection-end-column="39" />
+        <state relative-caret-position="222">
+          <caret line="80" column="5" lean-forward="true" selection-start-line="80" selection-start-column="5" selection-end-line="80" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#2501#2502#0" expanded="true" />
@@ -1454,100 +1571,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1158#1159#0" expanded="true" />
-            <element signature="e#1183#1184#0" expanded="true" />
-            <element signature="e#1229#1230#0" expanded="true" />
-            <element signature="e#1257#1258#0" expanded="true" />
-            <element signature="e#1302#1303#0" expanded="true" />
-            <element signature="e#1337#1338#0" expanded="true" />
-            <element signature="e#1399#1400#0" expanded="true" />
-            <element signature="e#1447#1448#0" expanded="true" />
-            <element signature="e#1498#1499#0" expanded="true" />
-            <element signature="e#1536#1537#0" expanded="true" />
-            <element signature="e#1607#1608#0" expanded="true" />
-            <element signature="e#1661#1662#0" expanded="true" />
-            <element signature="e#1717#1718#0" expanded="true" />
-            <element signature="e#1751#1752#0" expanded="true" />
-            <element signature="e#1823#1824#0" expanded="true" />
-            <element signature="e#1869#1870#0" expanded="true" />
-            <element signature="e#1931#1932#0" expanded="true" />
-            <element signature="e#1973#1974#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionMakerGlobal.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="47" column="8" lean-forward="true" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
+        <state relative-caret-position="531">
+          <caret line="39" column="14" lean-forward="false" selection-start-line="39" selection-start-column="14" selection-end-line="39" selection-end-column="14" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/Class2StringTest.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/constraints/OldConstraints.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="762">
-          <caret line="79" column="62" lean-forward="false" selection-start-line="79" selection-start-column="62" selection-end-line="79" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/NewOperatorTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="71">
-          <caret line="32" column="23" lean-forward="true" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/strucTypes5/TypeExprTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Type.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="369">
-          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+        <state relative-caret-position="255">
+          <caret line="17" column="5" lean-forward="true" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#492#493#0" expanded="true" />
+            <element signature="e#548#549#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TI.java">
+    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="20" column="50" lean-forward="false" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="50" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="46" column="27" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="35" column="56" lean-forward="false" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
+        <state relative-caret-position="262">
+          <caret line="104" column="74" lean-forward="true" selection-start-line="104" selection-start-column="74" selection-end-line="104" selection-end-column="74" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java b/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
index 62a2763e..9cfa24a4 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/Construct.java
@@ -5,13 +5,23 @@ package de.dhbwstuttgart.strucTypes5.algo;
  */
 
 
-import com.google.common.collect.Constraint;
+
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
+import de.dhbwstuttgart.strucTypes5.constraints.ConstraintField;
 import de.dhbwstuttgart.strucTypes5.constraints.ConstraintMethod;
+import de.dhbwstuttgart.strucTypes5.typeVars.GenericNames;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.statement.Receiver;
+import de.dhbwstuttgart.syntaxtree.statement.literal.Null;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typecheck.JavaClassName;
 
 import java.util.*;
 
@@ -35,9 +45,8 @@ public class Construct {
 
         // Generate a Interface for every StructuralType
         for (TypeVar typeVar  : constraintSet.keySet()) {
-            interfaceList.add(generateInterface(constraintSet.get(typeVar)));
+            interfaceList.add(generateInterface(typeVar , constraintSet.get(typeVar)));
         }
-
     }
 
 
@@ -57,6 +66,7 @@ public class Construct {
         Map<TypeVar, Set<ConstraintAbstract>> sortetConstraints  = new HashMap<>();
 
         for (ConstraintAbstract constraint : constraints) {
+
             if (constraint instanceof ConstraintMethod) {
                 ConstraintMethod constraintMethod = (ConstraintMethod) constraint;
 
@@ -65,10 +75,26 @@ public class Construct {
                 }
                 else {
                     Set<ConstraintAbstract> constraintSet = new HashSet<>();
+                    constraintSet.add(constraint);
                     sortetConstraints.put(constraintMethod.getReceiver() , constraintSet);
                 }
 
             }
+            else if (constraint instanceof ConstraintField ) {
+                ConstraintField constraintField = (ConstraintField) constraint;
+
+
+                if (sortetConstraints.containsKey(constraintField.getReceiver())) {
+                    sortetConstraints.get(constraintField.getReceiver()).add(constraintField);
+                }
+                else {
+                    Set<ConstraintAbstract> constraintSet = new HashSet<>();
+                    constraintSet.add(constraint);
+                    sortetConstraints.put(constraintField.getReceiver() , constraintSet);
+                }
+
+            }
+
             else {
                 remainingConstraints.add(constraint);
             }
@@ -79,15 +105,72 @@ public class Construct {
 
     /**
      * Method Generates Interfaces for the Structural Type.
-     * The Method also adds the new Constraints to the remainung Constraints List.
+     * The Method also adds the new Constraints to the remaining Constraints List.
      *
      */
-    private ClassOrInterface generateInterface(Set<ConstraintAbstract> constraintSet) {
+    private ClassOrInterface generateInterface(TypeVar receiver , Set<ConstraintAbstract> constraintSet) {
+
+        List<Field>  fields = new ArrayList<>();
+        List<Method> methods = new ArrayList<>();
+
+        List<GenericTypeVar> genericRefTypes = new ArrayList<>();
+        GenericDeclarationList generics = new GenericDeclarationList(genericRefTypes , new NullToken());
 
 
 
 
+        for (ConstraintAbstract constraint : constraintSet) {
+            if (constraint instanceof ConstraintField) {
+                ConstraintField cf = (ConstraintField) constraint;
+                // Field(String name, RefTypeOrTPHOrWildcardOrGeneric type, int modifier, Token offset)
 
+                RefType refType = new RefType(new JavaClassName( cf.getReceiver().toString()), new NullToken());
+                Field newField = new Field(cf.getNameOfField() ,refType , 0, new NullToken()  );
+                fields.add(newField);
+            }
+            else if (constraint instanceof  ConstraintMethod) {
+                ConstraintMethod cm = (ConstraintMethod) constraint;
+
+                // 	public Method(String name, RefTypeOrTPHOrWildcardOrGeneric returnType, int modifiers, ParameterList parameterList, Block block,
+                //GenericDeclarationList gtvDeclarations, Token offset)
+
+                String name = cm.getMethodName();
+
+
+                RefType returnType = new RefType(new JavaClassName(GenericNames.makeNewGenericName()) , new NullToken() );
+
+
+                int modifers = 0;
+
+                List<FormalParameter> formalParameters = new ArrayList<>();
+                ParameterList parameterList = new ParameterList(formalParameters, new NullToken());
+
+
+                Block block = null;
+                GenericDeclarationList genericDeclarationList = null;
+
+
+
+
+                Method m = new Method(name, returnType, modifers, parameterList, block , genericDeclarationList, new NullToken());
+                methods.add(m);
+            }
+        }
+
+
+        //Konstruktor:
+        //   public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, List<Method> methods, GenericDeclarationList genericClassParameters,
+        // RefTypeOrTPHOrWildcardOrGeneric superClass, Boolean isInterface, List<? extends RefTypeOrTPHOrWildca
+        int modifers = 0;
+        JavaClassName name = new JavaClassName(receiver.toString());
+        // Fields and Methos from List
+        GenericDeclarationList genericClassParameters = null;
+        RefTypeOrTPHOrWildcardOrGeneric superClass = null;
+        Boolean isInterface = true;
+        List<RefTypeOrTPHOrWildcardOrGeneric> implementetInterfaces = new ArrayList<>();
+
+        ClassOrInterface newInterface = new ClassOrInterface(modifers, name, fields,methods, genericClassParameters, superClass , isInterface, implementetInterfaces ,new NullToken());
+        return newInterface;
     }
 
 
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/ConstructInterfaceTemplates.java b/src/de/dhbwstuttgart/strucTypes5/algo/ConstructInterfaceTemplates.java
new file mode 100644
index 00000000..2b212edb
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/ConstructInterfaceTemplates.java
@@ -0,0 +1,170 @@
+package de.dhbwstuttgart.strucTypes5.algo;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+
+
+
+import de.dhbwstuttgart.strucTypes5.constraints.*;
+import de.dhbwstuttgart.strucTypes5.interfaceTemplates.FieldInterface;
+import de.dhbwstuttgart.strucTypes5.interfaceTemplates.Interface;
+import de.dhbwstuttgart.strucTypes5.interfaceTemplates.MethodInterface;
+import de.dhbwstuttgart.strucTypes5.typeVars.*;
+import de.dhbwstuttgart.syntaxtree.*;
+
+
+import java.util.*;
+
+/**
+ * Takes a Typled Class and a Constraint Set for construct the Interfaces
+ * => typed class = cl + typVarStore + List with Constraints
+ */
+public class ConstructInterfaceTemplates {
+
+    List<Interface> interfaceList = new ArrayList<>();
+    List<ConstraintAbstract> remainingConstraints = new ArrayList<>();
+
+
+    public ConstructInterfaceTemplates(ClassOrInterface classOrInterface, TypeVarStore typeVarStore , List<ConstraintAbstract> constraints, MappingAltNeu mappingAltNeu) {
+
+        // Sort the Constriants
+        Map<TypeVar, Set<ConstraintAbstract>> constraintSet =  sortConstriants(constraints, mappingAltNeu);
+
+        // Generate a Interface for every StructuralType
+        for (TypeVar typeVar  : constraintSet.keySet()) {
+            interfaceList.add(generateInterface(typeVar , constraintSet.get(typeVar) , typeVarStore , mappingAltNeu));
+        }
+
+    }
+
+
+
+
+
+    /**
+     *
+     * @param constraints
+     * @return
+     *
+     * Method sortet Constraints for ReceiverType for the Structural Type.
+     * Other Constraints as the Field or MethodsConstraints are copied to the global List remainungConstraints
+     *
+     */
+    private Map<TypeVar,Set<ConstraintAbstract>> sortConstriants(List<ConstraintAbstract> constraints , MappingAltNeu mappingAltNeu) {
+        Map<TypeVar, Set<ConstraintAbstract>> sortetConstraints  = new HashMap<>();
+
+        for (ConstraintAbstract constraint : constraints) {
+
+            if (constraint instanceof ConstraintMethod) {
+                ConstraintMethod constraintMethod = (ConstraintMethod) constraint;
+
+                if (sortetConstraints.containsKey(constraintMethod.getReceiver())) {
+                    sortetConstraints.get(constraintMethod.getReceiver()).add(constraintMethod);
+                }
+                else {
+                    Set<ConstraintAbstract> constraintSet = new HashSet<>();
+                    constraintSet.add(constraint);
+                    sortetConstraints.put(constraintMethod.getReceiver() , constraintSet);
+                }
+
+            }
+            else if (constraint instanceof ConstraintField ) {
+                ConstraintField constraintField = (ConstraintField) constraint;
+
+
+                if (sortetConstraints.containsKey(constraintField.getReceiver())) {
+                    sortetConstraints.get(constraintField.getReceiver()).add(constraintField);
+                }
+                else {
+                    Set<ConstraintAbstract> constraintSet = new HashSet<>();
+                    constraintSet.add(constraint);
+                    sortetConstraints.put(constraintField.getReceiver() , constraintSet);
+                }
+
+            }
+            else if (constraint instanceof ConstraintSubType) {
+                ConstraintSubType constraintSubType = (ConstraintSubType) constraint;
+                TypeVar lower = (TypeVar) mappingAltNeu.getNeu(constraintSubType.getSubtype());
+                TypeVar higher = (TypeVar) mappingAltNeu.getNeu(constraintSubType.getSuperType());
+                remainingConstraints.add(new ConstraintSubType(lower , higher));
+            }
+            else {
+                System.out.println(constraint.getClass());
+                remainingConstraints.add(constraint);
+            }
+        }
+        return sortetConstraints;
+    }
+
+
+    /**
+     * Method Generates Interfaces for the Structural Type.
+     * The Method also adds the new Constraints to the remaining Constraints List.
+     *
+     */
+    private Interface generateInterface(TypeVar receiver , Set<ConstraintAbstract> constraintSet , TypeVarStore typeVarStore , MappingAltNeu mappingAltNeu) {
+
+        List<FieldInterface>  fields = new ArrayList<>();
+        List<MethodInterface> methods = new ArrayList<>();
+        List<TypeVarAbstract> generics = new ArrayList<>();
+        List<TypeVarAbstract> genericsForConstraint = new ArrayList<>();
+
+
+        for (ConstraintAbstract constraint : constraintSet) {
+            if (constraint instanceof ConstraintField) {
+                ConstraintField cf = (ConstraintField) constraint;
+                fields.add(new FieldInterface(  typeVarStore.makeFreshTypeVar(), cf.getNameOfField() ));
+                // ToDo make constraint
+            }
+            else if (constraint instanceof  ConstraintMethod) {
+                ConstraintMethod cm = (ConstraintMethod) constraint;
+
+                // Erstelle Generics für Constraint
+                genericsForConstraint.add(mappingAltNeu.getNeu(cm.getReturnType()));
+                for (TypeVar tv : cm.getArgumentTypesBeta()) {
+                    genericsForConstraint.add(mappingAltNeu.getNeu(tv));
+                }
+
+                // Erstelle Generic für neuen Typvariablen für das Interface
+                List<TypeVarAbstract> args = new ArrayList<>();
+                for (TypeVar tv : cm.getArgumentTypes()) {
+                    TypeVar generic = typeVarStore.makeFreshTypeVar();
+                    args.add(generic);
+                }
+                TypeVar rtype = typeVarStore.makeFreshTypeVar();
+
+
+                MethodInterface methodInterface = new MethodInterface(cm.getMethodName(), rtype , args );
+
+                // Erstelle Generics für das Interface
+                generics.add(rtype);
+                generics.addAll(args);
+
+                methods.add(methodInterface);
+            }
+        }
+
+
+
+
+        TypeVar neuerTypeReveiver = (TypeVar) mappingAltNeu.getNeu(receiver);
+        InterfaceForConstraint interfaceForConstraint = new InterfaceForConstraint(receiver, genericsForConstraint);
+        remainingConstraints.add(new ConstraintSubTypeGeneric<>(neuerTypeReveiver , interfaceForConstraint ));
+
+        Interface newInterface = new Interface(receiver, fields, methods , generics);
+        return newInterface;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/TI.java b/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
index efa47825..4bfd9d14 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/TI.java
@@ -1,14 +1,26 @@
 package de.dhbwstuttgart.strucTypes5.algo;
 
+
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionClass;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.typeVars.ResultTuple;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.FormalParameter;
+import de.dhbwstuttgart.syntaxtree.Method;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by sebastian on 20.04.17.
  */
 public class TI {
 
+    public AssumptionMap assresult;
+
 
     // Start TypeInference Algorithm, need Assumptions and  a Class
     public TI(AssumptionMap ass , ClassOrInterface cl) {
@@ -17,17 +29,41 @@ public class TI {
         Type type = new Type(ass , cl, typeVarStore);
 
 
+        // Neue TypVariablen
+        ResultTuple tp = typeVarStore.freshVariableAndMapping();
 
-        // Construct soll die Interfaces erstellen
-        // Construct
-        // Solve
+        // Einfache Implementierung -> Es werden die erforderlichen Daten für die Constraits und Interface zusammengetragen
+        ConstructInterfaceTemplates constructInterfaceTemplates = new ConstructInterfaceTemplates(cl, tp.getTypeVarStore(), type.constraintList , tp.getMappingAltNeu());
+        System.out.println(constructInterfaceTemplates.interfaceList);
+        System.out.println(constructInterfaceTemplates.remainingConstraints);
 
 
+        // Generiere Generics für die Klasse
+        List<TypeVarAbstract> generics = new ArrayList<>();
+        for (Method m : cl.getMethods()) {
+            generics.add(tp.getTypeVarStore().getTypeVarByTPH(m.getType()));
+            for (FormalParameter fp : m.getParameterList().getFormalparalist()) {
+                generics.add(tp.getTypeVarStore().getTypeVarByTPH(fp.getType()));
+            }
+        }
 
+        // Assumption Map für weitere Anwendungen
+        AssumptionClass assumptionClass = new AssumptionClass(cl,tp.getTypeVarStore(),ass, constructInterfaceTemplates.remainingConstraints , constructInterfaceTemplates.interfaceList, generics);
+        AssumptionMap assumptionMapNew = new AssumptionMap();
+        assumptionMapNew.addAssumption(assumptionClass);
+        assresult = assumptionMapNew;
+
+        System.out.println(tp.getTypeVarStore());
     }
 
 
 
 
 
+
+
+
+
+
+
 }
diff --git a/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java b/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
index 03431c46..d621a363 100644
--- a/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
+++ b/src/de/dhbwstuttgart/strucTypes5/algo/TypeExpr.java
@@ -1,11 +1,12 @@
 package de.dhbwstuttgart.strucTypes5.algo;
 
 
+import de.dhbwstuttgart.strucTypes3.SubTypeConstraint;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionClass;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
 import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
-import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
-import de.dhbwstuttgart.strucTypes5.constraints.ConstraintFactory;
+import de.dhbwstuttgart.strucTypes5.constraints.*;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarFactory;
@@ -13,6 +14,8 @@ import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 
 
 import java.util.ArrayList;
@@ -85,6 +88,31 @@ public class TypeExpr {
                 for (Expression arg : methodCall.get_ArgList().getArguments()) {
                     result.addAll(typeExpression(arg));
                 }
+
+
+                //  zuordnen der Variablen zu den ermittelten typen
+                AssumptionClass assumptionClass = assumptionMap.getClassAssumption(methodCall.get_Receiver().getType().toString());
+                if (assumptionClass != null) {
+                    Method m = assumptionClass.getCl().getMethods().get(0);
+                    for (int i = 0; i < methodCall.get_ArgList().getArguments().size()  ; i++) {
+                        // Verknüpfen von typeVar und typeVar
+                        RefTypeOrTPHOrWildcardOrGeneric tmold = m.getParameterList().getFormalparalist().get(i).getType();
+                        RefTypeOrTPHOrWildcardOrGeneric takt = methodCall.get_ArgList().getArguments().get(i).getType();
+                        System.out.println(assumptionClass.getTypeVarStore().getTypeVarByTPH(tmold) +  "<" +  typeVarStore.getTypeVarByTPH(takt));
+                        TypeVar x = (TypeVar) assumptionClass.getTypeVarStore().getTypeVarByTPH(tmold);
+                        TypeVar y = (TypeVar) typeVarStore.getTypeVarByTPH(takt);
+                        List<ConstraintAbstract> foroldConstraints = new ArrayList<>();
+                        foroldConstraints.add(new ConstraintSubType(y,x));
+                        OldConstraints oldConstraints = new OldConstraints(foroldConstraints);
+                        result.add(oldConstraints);
+                    }
+                }
+
+
+
+
+
+
                 return result;
             }
             else {
@@ -94,13 +122,10 @@ public class TypeExpr {
                 for (Expression arg : methodCall.get_ArgList().getArguments()) {
                     result.addAll(typeExpression(arg));
                 }
-
                 result.addAll(ConstraintFactory.generateConstraintMethod(methodCall, typeVarStore));
                 return result;
+
             }
-
-
-
         }
         else if (expression instanceof Receiver) {
             Receiver receiver = (Receiver) expression;
@@ -118,11 +143,21 @@ public class TypeExpr {
                 result.addAll(typeExpression(arg));
             }
 
-           //typeVarStore.addTuple(TypeVarFactory.makeTypeVar() , newClass.getType());
+            System.out.println(newClass.getType());
+            System.out.println(newClass.getType().getClass());
+
+            //Versuche Informationen zu laden
+
+            AssumptionClass assumptionClass = assumptionMap.getClassAssumption(newClass.getType().toString());
+            if (assumptionClass != null) {
+                System.out.println("assumption gefunden");
+                OldConstraints oldConstraints= new OldConstraints(assumptionClass.getConstraints());
+                result.add(oldConstraints);
+            }
+
+            typeVarStore.addTuple(TypeVarFactory.makeTypeVar() , newClass.getType());
 
 
-
-            //
             return result;
         }
         else {
diff --git a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
index e6c7c7c1..fbabc0da 100644
--- a/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
+++ b/src/de/dhbwstuttgart/strucTypes5/assumptions/AssumptionClass.java
@@ -1,7 +1,10 @@
 package de.dhbwstuttgart.strucTypes5.assumptions;
 
-import de.dhbwstuttgart.strucTypes2.Assumptions_Map;
-import de.dhbwstuttgart.strucTypes3.ConstraintAbstract;
+
+import de.dhbwstuttgart.strucTypes5.constraints.ConstraintAbstract;
+import de.dhbwstuttgart.strucTypes5.interfaceTemplates.Interface;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVar;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
 import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 
@@ -10,26 +13,29 @@ import java.util.List;
 /**
  * Created by sebastian on 21.04.17.
  */
-public class AssumptionClass extends AssumptionAbstract  {
+public class AssumptionClass extends AssumptionAbstract {
 
     // Die Angaben entspreichen einer clT Klasse
     private ClassOrInterface cl;
     private TypeVarStore typeVarStore;
-    private Assumptions_Map assumptions_map;
+    private AssumptionMap assumptionMap;
     private List<ConstraintAbstract> constraints;
-    private List<ClassOrInterface> generatedinterfaces;
+    private List<Interface> generatedinterfaces;
+    private List<TypeVarAbstract> genericsForClass;
 
-    public AssumptionClass(ClassOrInterface cl, TypeVarStore typeVarStore, Assumptions_Map assumptions_map, List<ConstraintAbstract> constraints, List<ClassOrInterface> generatedinterfaces) {
+    public AssumptionClass() {
+
+    }
+
+    public AssumptionClass(ClassOrInterface cl, TypeVarStore typeVarStore, AssumptionMap assumptionMap, List<ConstraintAbstract> constraints, List<Interface> generatedinterfaces, List<TypeVarAbstract> genericsForClass) {
         this.cl = cl;
         this.typeVarStore = typeVarStore;
-        this.assumptions_map = assumptions_map;
+        this.assumptionMap = assumptionMap;
         this.constraints = constraints;
         this.generatedinterfaces = generatedinterfaces;
+        this.genericsForClass = genericsForClass;
     }
 
-    public AssumptionClass () {
-
-    }
 
     public ClassOrInterface getCl() {
         return cl;
@@ -47,12 +53,12 @@ public class AssumptionClass extends AssumptionAbstract  {
         this.typeVarStore = typeVarStore;
     }
 
-    public Assumptions_Map getAssumptions_map() {
-        return assumptions_map;
+    public AssumptionMap getAssumptionMap() {
+        return assumptionMap;
     }
 
-    public void setAssumptions_map(Assumptions_Map assumptions_map) {
-        this.assumptions_map = assumptions_map;
+    public void setAssumptionMap(AssumptionMap assumptionMap) {
+        this.assumptionMap = assumptionMap;
     }
 
     public List<ConstraintAbstract> getConstraints() {
@@ -63,12 +69,21 @@ public class AssumptionClass extends AssumptionAbstract  {
         this.constraints = constraints;
     }
 
-    public List<ClassOrInterface> getGeneratedinterfaces() {
+    public List<Interface> getGeneratedinterfaces() {
         return generatedinterfaces;
     }
 
-    public void setGeneratedinterfaces(List<ClassOrInterface> generatedinterfaces) {
+    public void setGeneratedinterfaces(List<Interface> generatedinterfaces) {
         this.generatedinterfaces = generatedinterfaces;
     }
 
+    public List<TypeVarAbstract> getGenericsForClass() {
+        return genericsForClass;
+    }
+
+    public void setGenericsForClass(List<TypeVarAbstract> genericsForClass) {
+        this.genericsForClass = genericsForClass;
+    }
+
+
 }
diff --git a/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java b/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java
index d090ad13..3e228ddd 100644
--- a/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java
+++ b/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintFactory.java
@@ -41,7 +41,8 @@ public class ConstraintFactory {
             neueTypeVars.add(newVar);
             typeVarsArg.add(oldVar);
 
-            ConstraintSubTypeGeneric<TypeVar,TypeVar> subTypeGeneric = new ConstraintSubTypeGeneric<>(newVar,oldVar);
+            //ConstraintSubTypeGeneric<TypeVar,TypeVar> subTypeGeneric = new ConstraintSubTypeGeneric<>(newVar,oldVar);
+            ConstraintSubType subTypeGeneric = new ConstraintSubType(oldVar, newVar);
             resultConstraints.add(subTypeGeneric);
         }
         resultConstraints.add(new ConstraintMethod(receiver, methodCall.get_Name(), typeVarsArg, caller  , neueTypeVars  ));
diff --git a/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java b/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java
index 0cf1abfe..39928f5b 100644
--- a/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java
+++ b/src/de/dhbwstuttgart/strucTypes5/constraints/ConstraintSubType.java
@@ -15,6 +15,11 @@ public class ConstraintSubType extends ConstraintAbstract{
     private TypeVar subtype;
     private TypeVar superType;
 
+    public ConstraintSubType(TypeVar subtype, TypeVar superType) {
+        this.subtype = subtype;
+        this.superType = superType;
+    }
+
     public TypeVar getSubtype() {
         return subtype;
     }
diff --git a/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java b/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java
new file mode 100644
index 00000000..11fb1a1e
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/constraints/InterfaceForConstraint.java
@@ -0,0 +1,42 @@
+package de.dhbwstuttgart.strucTypes5.constraints;
+
+import de.dhbwstuttgart.strucTypes5.algo.Type;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
+
+import java.util.List;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+public class InterfaceForConstraint {
+
+    private TypeVarAbstract strucType;
+    private List<TypeVarAbstract> generics;
+
+
+    public InterfaceForConstraint(TypeVarAbstract strucType, List<TypeVarAbstract> generics) {
+        this.strucType = strucType;
+        this.generics = generics;
+    }
+
+    public TypeVarAbstract getStrucType() {
+        return strucType;
+    }
+
+    public void setStrucType(TypeVarAbstract strucType) {
+        this.strucType = strucType;
+    }
+
+    public List<TypeVarAbstract> getGenerics() {
+        return generics;
+    }
+
+    public void setGenerics(List<TypeVarAbstract> generics) {
+        this.generics = generics;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("sT %s <%s> " , strucType , generics);
+    }
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/constraints/OldConstraints.java b/src/de/dhbwstuttgart/strucTypes5/constraints/OldConstraints.java
new file mode 100644
index 00000000..9f0ace40
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/constraints/OldConstraints.java
@@ -0,0 +1,24 @@
+package de.dhbwstuttgart.strucTypes5.constraints;
+
+import java.util.List;
+
+/**
+ * Created by sebastian on 22.04.17.
+ */
+
+/*
+Soll Constraints durch die Construct methode schleusen
+ */
+public class OldConstraints  extends  ConstraintAbstract{
+
+    public List<ConstraintAbstract> constraintAbstractList;
+
+    public OldConstraints(List<ConstraintAbstract> constraintAbstractList) {
+        this.constraintAbstractList = constraintAbstractList;
+    }
+
+    @Override
+    public String toString() {
+        return constraintAbstractList.toString();
+    }
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/factoryForSyntaxtree/FactoryForElementes.java b/src/de/dhbwstuttgart/strucTypes5/factoryForSyntaxtree/FactoryForElementes.java
new file mode 100644
index 00000000..502ff9b6
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/factoryForSyntaxtree/FactoryForElementes.java
@@ -0,0 +1,44 @@
+package de.dhbwstuttgart.strucTypes5.factoryForSyntaxtree;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
+import de.dhbwstuttgart.syntaxtree.Generic;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typecheck.GenericTypeName;
+import de.dhbwstuttgart.typecheck.JavaClassName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+public class FactoryForElementes {
+
+    public static GenericTypeVar createGeneric(String nameOfGeneric) {
+        // Code der benötigt wird um ein Generic zu erstellen.
+        List<RefTypeOrTPHOrWildcardOrGeneric> list = new ArrayList<>();
+        GenericContext genericContext = new GenericContext(new JavaClassName("") , new String(""));
+        GenericTypeName genericTypeName = new GenericTypeName(genericContext,nameOfGeneric);
+        GenericTypeVar genericTypeVar = new GenericTypeVar( genericTypeName, list , new NullToken() , new NullToken());
+        return genericTypeVar;
+    }
+
+
+    public static GenericRefType createGenericRefType(String nameOfGeneric) {
+        GenericContext genericContext = new GenericContext(new JavaClassName("") , new String(""));
+        GenericTypeName genericTypeName = new GenericTypeName(genericContext,nameOfGeneric);
+        GenericRefType genericRefType = new GenericRefType( genericTypeName , new NullToken());
+        return genericRefType;
+    }
+
+
+
+
+
+
+
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java
new file mode 100644
index 00000000..2348893b
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/FieldInterface.java
@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.strucTypes5.interfaceTemplates;
+
+
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
+
+/**
+ * Created by sebastian on 09.04.17.
+ */
+public class FieldInterface {
+
+    TypeVarAbstract type;
+    String name;
+
+    public FieldInterface(TypeVarAbstract type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    public TypeVarAbstract getType() {
+        return type;
+    }
+
+    public void setType(TypeVarAbstract type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+    @Override
+    public String toString() {
+        return String.format("%s %s  "  , type , name  );
+    }
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java
new file mode 100644
index 00000000..d5487de2
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/Interface.java
@@ -0,0 +1,60 @@
+package de.dhbwstuttgart.strucTypes5.interfaceTemplates;
+
+
+
+
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
+
+import java.util.List;
+
+
+/**
+ * Created by sebastian on 09.04.17.
+ */
+public class Interface {
+
+    TypeVarAbstract strucType;
+    List<FieldInterface> fields;
+    List<MethodInterface> methods;
+    List<TypeVarAbstract> generics;
+
+
+    public Interface(TypeVarAbstract strucType, List<FieldInterface> fields, List<MethodInterface> methods, List<TypeVarAbstract> generics) {
+        this.strucType = strucType;
+        this.fields = fields;
+        this.methods = methods;
+        this.generics = generics;
+    }
+
+    public List<FieldInterface> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<FieldInterface> fields) {
+        this.fields = fields;
+    }
+
+    public List<MethodInterface> getMethods() {
+        return methods;
+    }
+
+    public void setMethods(List<MethodInterface> methods) {
+        this.methods = methods;
+    }
+
+    public List<TypeVarAbstract> getGenerics() {
+        return generics;
+    }
+
+    public void setGenerics(List<TypeVarAbstract> generics) {
+        this.generics = generics;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("interface %s < %s >  { \n %s \n %s } \n \n " , strucType , generics, fields.toString() , methods.toString());
+    }
+
+
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java
new file mode 100644
index 00000000..e0b6d7b7
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/interfaceTemplates/MethodInterface.java
@@ -0,0 +1,54 @@
+package de.dhbwstuttgart.strucTypes5.interfaceTemplates;
+
+
+
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarAbstract;
+
+import java.util.List;
+
+/**
+ * Created by sebastian on 09.04.17.
+ */
+public class MethodInterface {
+
+    String name;
+    TypeVarAbstract rtType;
+    List<TypeVarAbstract> argsTypes;
+
+
+    public MethodInterface(String name, TypeVarAbstract rtType, List<TypeVarAbstract> argsTypes) {
+        this.name = name;
+        this.rtType = rtType;
+        this.argsTypes = argsTypes;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public TypeVarAbstract getRtType() {
+        return rtType;
+    }
+
+    public void setRtType(TypeVarAbstract rtType) {
+        this.rtType = rtType;
+    }
+
+    public List<TypeVarAbstract> getArgsTypes() {
+        return argsTypes;
+    }
+
+    public void setArgsTypes(List<TypeVarAbstract> argsTypes) {
+        this.argsTypes = argsTypes;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("  %s %s ( %s ); " , rtType, name, argsTypes.toString());
+    }
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/typeVars/GenericNames.java b/src/de/dhbwstuttgart/strucTypes5/typeVars/GenericNames.java
new file mode 100644
index 00000000..234d6f38
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/typeVars/GenericNames.java
@@ -0,0 +1,21 @@
+package de.dhbwstuttgart.strucTypes5.typeVars;
+
+/**
+ * Created by sebastian on 21.04.17.
+ */
+public class GenericNames {
+
+    private static Integer counter =  new Integer(1);
+
+    public static String makeNewGenericName() {
+        return new String("G" + counter.toString());
+    }
+
+
+
+
+
+
+
+
+}
diff --git a/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java b/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java
new file mode 100644
index 00000000..14722bbf
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/typeVars/MappingAltNeu.java
@@ -0,0 +1,45 @@
+package de.dhbwstuttgart.strucTypes5.typeVars;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by sebastian on 15.04.17.
+ */
+public class MappingAltNeu {
+
+
+        List<TypeVarAbstract> altList = new ArrayList<>();
+        List<TypeVarAbstract> neuList = new ArrayList<>();
+
+        public void addTypeVar(TypeVarAbstract alt, TypeVarAbstract neu) {
+            altList.add(alt);
+
+            // Versuch bereits bekannte Typen mitzunehmen
+            // geht nur wenn dies auch dem TypeVarStore bekannt ist
+            if (alt.getClass().equals(TypeVarType.class)) {
+                neuList.add(alt);
+            }
+            else {
+                neuList.add(neu);
+            }
+        }
+
+        public TypeVarAbstract getNeu (TypeVarAbstract altTypeVar) {
+
+            // Wenn typ bereits bekannt ist
+            //if (altTypeVar.getClass().equals(TypeVarType.class)) {
+            //    return altTypeVar;
+            //}
+
+            // Typvariable nicht bekannt
+            //if ( ! neuList.contains(altTypeVar)) {
+            //   return altTypeVar;
+            //}
+            //System.out.println(altTypeVar);
+
+            return neuList.get(altList.indexOf(altTypeVar));
+        }
+    }
+
diff --git a/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java b/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java
new file mode 100644
index 00000000..27af2b1d
--- /dev/null
+++ b/src/de/dhbwstuttgart/strucTypes5/typeVars/ResultTuple.java
@@ -0,0 +1,36 @@
+package de.dhbwstuttgart.strucTypes5.typeVars;
+
+
+
+
+/**
+ * Created by sebastian on 15.04.17.
+ */
+public class ResultTuple {
+
+        public MappingAltNeu mappingAltNeu;
+        public TypeVarStore typeVarStore;
+
+    public ResultTuple(MappingAltNeu mappingAltNeu, TypeVarStore typeVarStore) {
+        this.mappingAltNeu = mappingAltNeu;
+        this.typeVarStore = typeVarStore;
+    }
+
+
+    public MappingAltNeu getMappingAltNeu() {
+        return mappingAltNeu;
+    }
+
+    public void setMappingAltNeu(MappingAltNeu mappingAltNeu) {
+        this.mappingAltNeu = mappingAltNeu;
+    }
+
+    public TypeVarStore getTypeVarStore() {
+        return typeVarStore;
+    }
+
+    public void setTypeVarStore(TypeVarStore typeVarStore) {
+        this.typeVarStore = typeVarStore;
+    }
+}
+
diff --git a/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java b/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java
index bca03a66..2757ca54 100644
--- a/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java
+++ b/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVar.java
@@ -14,7 +14,7 @@ public class TypeVar extends TypeVarAbstract {
 
     @Override
     public String toString() {
-        return String.format("TVar: %s" , id);
+        return String.format("TVar_%s" , id);
     }
 
     @Override
diff --git a/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java b/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java
index 068053b6..9c4df58f 100644
--- a/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java
+++ b/src/de/dhbwstuttgart/strucTypes5/typeVars/TypeVarStore.java
@@ -95,7 +95,7 @@ public class TypeVarStore {
     }
 
 
-    /*
+
     public ResultTuple freshVariableAndMapping() {
 
        MappingAltNeu mappingAltNeu = new MappingAltNeu();
@@ -135,7 +135,7 @@ public class TypeVarStore {
         }
     }
 
-    */
+
 
 
 
diff --git a/test/strucTypes5/ConstructTest.jav b/test/strucTypes5/ConstructTest.jav
new file mode 100644
index 00000000..c3f90775
--- /dev/null
+++ b/test/strucTypes5/ConstructTest.jav
@@ -0,0 +1,13 @@
+
+
+
+
+class A {
+    Integer i;
+    mt(x,y,z) { return x.sub(y).add(z); }
+}
+
+
+
+
+
diff --git a/test/strucTypes5/ConstructTest.java b/test/strucTypes5/ConstructTest.java
new file mode 100644
index 00000000..730f347f
--- /dev/null
+++ b/test/strucTypes5/ConstructTest.java
@@ -0,0 +1,101 @@
+package strucTypes5;
+
+import de.dhbwstuttgart.parser.JavaTXParser;
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
+import de.dhbwstuttgart.strucTypes5.algo.TI;
+import de.dhbwstuttgart.strucTypes5.algo.Type;
+import de.dhbwstuttgart.strucTypes5.algo.TypeExpr;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerGlobal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typecheck.GenericTypeName;
+import de.dhbwstuttgart.typecheck.JavaClassName;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Dieser Test pr�ft nur, ob .java-Dateien fehlerfrei geparst werden. Der
+ * dabei erstellte Syntaxbaum wird nicht kontrolliert.
+ * 
+ * @author janulrich
+ *
+ */
+public class ConstructTest {
+	private static final String rootDirectory = System.getProperty("user.dir") + "/test/strucTypes5/";
+
+	@Test
+	public void run() {
+
+
+		List<String> filenames = new ArrayList<String>();
+		filenames.add("ConstructTest.jav");
+
+		JavaTXParser parser = new JavaTXParser();
+		try {
+			for (String filename : filenames) {
+
+				System.out.println("Teste: " + filename);
+
+				SourceFile sf = parser.parse(new File(rootDirectory + filename));
+
+
+				/*
+
+				// Test of the Global Assumption Maker who make mass und fass;
+				TypeVarStore typeVarStore = new TypeVarStore();
+				AssumptionMakerGlobal makerGlobal = new AssumptionMakerGlobal(sf.getClasses().get(0), typeVarStore );
+				System.out.println(typeVarStore.toString());
+				System.out.println(makerGlobal.getAssumptionAbstractList().toString()) ;
+
+
+				// Test of the Local AssumptionMaker who only makes the Assumption for an Local Method;
+				AssumptionMakerLocal assumptionMakerLocal = new AssumptionMakerLocal(sf.getClasses().get(0).getMethods().get(0) , typeVarStore);
+				System.out.println(assumptionMakerLocal.getResultAssumptionList());
+
+
+				List<AssumptionAbstract> assAll = new ArrayList<>();
+				assAll.addAll(assumptionMakerLocal.getResultAssumptionList());
+				assAll.addAll(makerGlobal.getAssumptionAbstractList());
+				AssumptionMap assumptionMap = new AssumptionMap();
+				assumptionMap.addAll(assAll);
+				*/
+
+
+				ClassOrInterface clA = sf.getClasses().get(0);
+				AssumptionMap map = new AssumptionMap();
+
+				TI ti = new TI(map , clA);
+
+
+
+				// Code der benötigt wird um ein Generic zu erstellen.
+				List<RefTypeOrTPHOrWildcardOrGeneric> list = new ArrayList<>();
+				GenericContext genericContext = new GenericContext(new JavaClassName("") , new String(""));
+				GenericTypeName genericTypeName = new GenericTypeName(genericContext,"nameOfGeneric");
+				GenericTypeVar genericTypeVar = new GenericTypeVar( genericTypeName, list , new NullToken() , new NullToken());
+				System.out.println(genericTypeVar);
+
+				//
+
+			}
+
+		} catch (Exception exc) {
+			exc.printStackTrace();
+			fail();
+		}
+		assertTrue("Tests durchlaufen", filenames.size() > 0);
+	}
+}
diff --git a/test/strucTypes5/NewOperatorTest.jav b/test/strucTypes5/NewOperatorTest.jav
index 98541b00..8be58af0 100644
--- a/test/strucTypes5/NewOperatorTest.jav
+++ b/test/strucTypes5/NewOperatorTest.jav
@@ -6,7 +6,9 @@ main () { return new A().mt(new Main() , new A() , new A() );  }
 }
 
 
-class A {
+class A{
+
+
 
 }
 
diff --git a/test/strucTypes5/NewOperatorTest2.jav b/test/strucTypes5/NewOperatorTest2.jav
new file mode 100644
index 00000000..57b0d741
--- /dev/null
+++ b/test/strucTypes5/NewOperatorTest2.jav
@@ -0,0 +1,20 @@
+
+
+
+class Main {
+main () { return new A().mt( new MyInteger() , new MyInteger() , new MyInteger() );  }
+}
+
+
+class A{
+mt(x,y,z) { return x.sub(y).add(z); }
+}
+
+
+class MyInteger {
+
+}
+
+
+
+
diff --git a/test/strucTypes5/NewOperatorTest2.java b/test/strucTypes5/NewOperatorTest2.java
new file mode 100644
index 00000000..ae3a264d
--- /dev/null
+++ b/test/strucTypes5/NewOperatorTest2.java
@@ -0,0 +1,83 @@
+package strucTypes5;
+
+import de.dhbwstuttgart.parser.JavaTXParser;
+import de.dhbwstuttgart.strucTypes5.algo.TI;
+import de.dhbwstuttgart.strucTypes5.algo.TypeExpr;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionAbstract;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerGlobal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMakerLocal;
+import de.dhbwstuttgart.strucTypes5.assumptions.AssumptionMap;
+import de.dhbwstuttgart.strucTypes5.ausgabe.Class2String;
+import de.dhbwstuttgart.strucTypes5.typeVars.TypeVarStore;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Dieser Test pr�ft nur, ob .java-Dateien fehlerfrei geparst werden. Der
+ * dabei erstellte Syntaxbaum wird nicht kontrolliert.
+ * 
+ * @author janulrich
+ *
+ */
+public class NewOperatorTest2 {
+	private static final String rootDirectory = System.getProperty("user.dir") + "/test/strucTypes5/";
+
+	@Test
+	public void run() {
+
+
+		List<String> filenames = new ArrayList<String>();
+		filenames.add("NewOperatorTest2.jav");
+
+		JavaTXParser parser = new JavaTXParser();
+		try {
+			for (String filename : filenames) {
+
+				System.out.println("Teste: " + filename);
+
+				SourceFile sf = parser.parse(new File(rootDirectory + filename));
+
+				SourceFile sfdebug = sf;
+
+				ClassOrInterface mainClass = sf.getClasses().get(0);
+				ClassOrInterface aClass = sf.getClasses().get(1);
+
+
+				AssumptionMap assumptionMap = new AssumptionMap();
+
+				TI ti = new TI(assumptionMap, aClass);
+
+				TI ti1 = new TI(ti.assresult, mainClass);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+			}
+
+		} catch (Exception exc) {
+			exc.printStackTrace();
+			fail();
+		}
+		assertTrue("Tests durchlaufen", filenames.size() > 0);
+	}
+}