diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6bc01a8..c3dfb30 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class
index 8567a9b..f4062e0 100644
Binary files a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class
index 0d99f9f..3410db7 100644
Binary files a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class
deleted file mode 100644
index 09c27a7..0000000
Binary files a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class and /dev/null differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class
index 4b09bb6..f7ba452 100644
Binary files a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class
index 984b723..ff2127d 100644
Binary files a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class differ
diff --git a/src/ch/zhaw/catan/Dummy.java b/src/ch/zhaw/catan/Dummy.java
index fdcab53..e9eb5db 100644
--- a/src/ch/zhaw/catan/Dummy.java
+++ b/src/ch/zhaw/catan/Dummy.java
@@ -15,15 +15,14 @@ public class Dummy {
     SHOW, QUIT
   }
 
-
   private void run() {
     TextIO textIO = TextIoFactory.getTextIO();
     TextTerminal<?> textTerminal = textIO.getTextTerminal();
 
     SiedlerBoard board = new SiedlerBoard();
     board.addField(new Point(2, 2), Land.FOREST);
-    board.setCorner(new Point(3, 3), "RR");
-    board.setEdge(new Point(2, 0), new Point(3, 1), "r");
+    board.setCorner(new Point(3, 3), new Settlement(Config.Faction.RED));
+    board.setEdge(new Point(2, 0), new Point(3, 1), new Road(Config.Faction.BLUE));
     board.addFieldAnnotation(new Point(2, 2), new Point(3, 1), "AA");
 
     Map<Point, Label> lowerFieldLabel = new HashMap<>();
diff --git a/src/ch/zhaw/catan/Road.java b/src/ch/zhaw/catan/Road.java
index 92ac502..360e794 100644
--- a/src/ch/zhaw/catan/Road.java
+++ b/src/ch/zhaw/catan/Road.java
@@ -4,8 +4,10 @@ import java.util.HashMap;
 
 public class Road {
     private HashMap<Config.Resource,Integer> buildCost;
+    private Config.Faction faction;
 
-    public Road() {
+    public Road(Config.Faction faction) {
+        this.faction = faction;
         buildCost = new HashMap<>();
         buildCost.put(Config.Resource.BRICK,1);
         buildCost.put(Config.Resource.LUMBER,1);
diff --git a/src/ch/zhaw/catan/Settlement.java b/src/ch/zhaw/catan/Settlement.java
index 289e9e8..6e11e5d 100644
--- a/src/ch/zhaw/catan/Settlement.java
+++ b/src/ch/zhaw/catan/Settlement.java
@@ -4,8 +4,10 @@ import java.util.HashMap;
 
 public class Settlement {
     private HashMap<Config.Resource,Integer> buildCost;
+    private Config.Faction faction;
 
-    public Settlement() {
+    public Settlement(Config.Faction faction) {
+        this.faction = faction;
         buildCost = new HashMap<>();
         buildCost.put(Config.Resource.LUMBER,1);
         buildCost.put(Config.Resource.BRICK,1);
diff --git a/src/ch/zhaw/catan/SiedlerBoard.java b/src/ch/zhaw/catan/SiedlerBoard.java
index b073e13..502d852 100644
--- a/src/ch/zhaw/catan/SiedlerBoard.java
+++ b/src/ch/zhaw/catan/SiedlerBoard.java
@@ -8,7 +8,7 @@ import java.awt.*;
 import java.util.*;
 import java.util.List;
 
-public class SiedlerBoard extends HexBoard<Land, String, String, String> {
+public class SiedlerBoard extends HexBoard<Land, Settlement, Road, String> {
 
     Map<Point, ch.zhaw.hexboard.Label> lowerFieldLabel = new HashMap<>();