diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index e0de112327814f38cc33226e2697eeb9314b1e41..4e4693f81e9062066a3c641356706400188bf6f1 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -1,10 +1,13 @@
 package model;
 
+import javafx.geometry.Pos;
 import util.Position;
 
 import java.util.Set;
 
 public class Fire {
-    private final int initialFireCount;
-    private Set<Position> firePositions;
+    private Position firePositions;
+    public Fire(Position position){
+          this.firePositions = position;
+    }
 }
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index d8bdf882d20f64cda70ae46e1f4ef2b3977beafa..bd80252585f2b5dcca8a646813b8f96c16d9a0fa 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -6,7 +6,10 @@ import java.util.List;
 
 public class FireFighter {
 
-    private final int initialFirefighterCount;
-    private List<Position> firefighterPositions;
+    private Position firefighterPositions;
+
+    public FireFighter(Position firefighterPositions) {
+        this.firefighterPositions = firefighterPositions;
+    }
 
 }
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index f324d7dee477cb527f117a83c15028928eef9aa5..9c552466b714544d8c209dc4e6d44206206f95b5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -8,7 +8,11 @@ import java.util.*;
 public class FirefighterBoard implements Board<List<ModelElement>> {
   private final int columnCount;
   private final int rowCount;
+  private final int initialFireCount;
+  private final int initialFirefighterCount;
   private final TargetStrategy targetStrategy = new TargetStrategy();
+  private List<FireFighter> firefighter;
+  private Set<Fire> fire;
   private Map<Position, List<Position>> neighbors = new HashMap();
   private final Position[][] positions;
   private int step = 0;
@@ -36,12 +40,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   }
 
   public void initializeElements() {
-    firefighterPositions = new ArrayList<>();
-    firePositions = new HashSet<>();
+    firefighter= new ArrayList<>();
+    fire = new HashSet<>();
     for (int index = 0; index < initialFireCount; index++)
-      firePositions.add(randomPosition());
+      fire.add(randomPosition());
     for (int index = 0; index < initialFirefighterCount; index++)
-      firefighterPositions.add(randomPosition());
+      firefighter.add(randomPosition());
   }
 
   private Position randomPosition() {