diff --git a/src/World/terain.cpp b/src/World/Terrain.cpp
similarity index 100%
rename from src/World/terain.cpp
rename to src/World/Terrain.cpp
diff --git a/src/World/Terrain.h b/src/World/Terrain.h
new file mode 100644
index 0000000..9f8b2d0
--- /dev/null
+++ b/src/World/Terrain.h
@@ -0,0 +1,21 @@
+#ifndef TERRAIN_H
+#define TERRAIN_H
+
+#include <cstdint>
+#include "../Actors"
+
+
+class Terrain
+{
+public:
+    bool collides(const Actor & actor, const Level & level, uint16_t tilePositionX, uint16_t tilePositionY);
+
+private:
+    uint8_t m_type; //0 if it depends on neighboring tiles (diagonals)
+    uint16_t m_object; //Id of object on the tile, tree, collectable,...
+
+
+
+};
+
+#endif
\ No newline at end of file
diff --git a/src/World/Tile.h b/src/World/Tile.h
index 6a013d2..a8aa282 100644
--- a/src/World/Tile.h
+++ b/src/World/Tile.h
@@ -1,4 +1,4 @@
-#ifndef TILE_H
+ #ifndef TILE_H
 #define TILE_H
 
 #include <cstdint>
diff --git a/src/World/map.h b/src/World/map.h
index 204949d..5fb681b 100644
--- a/src/World/map.h
+++ b/src/World/map.h
@@ -4,6 +4,7 @@
 #include <cstdint>
 #include <array>
 #include <vector>
+#include <memory>
 #include "Tile.h"
 
 class Map
@@ -11,12 +12,12 @@ class Map
 public:
 
 private:
-    int16_t size_x_;
-    int16_t size_y_;
+    uint16_t m_height;
+    uint16_t m_widht;
 
-    int8_t* terrain_map_;
-    Tile* tile_map_;
-    std::vector<int16_t> static_objects_;
+    uint8_t* m_terrain_map;
+    Tile* m_tile_map;
+    std::vector<int16_t> m_static_objects;
 
 };
 
diff --git a/src/World/terain.h b/src/World/terain.h
deleted file mode 100644
index 64aa340..0000000
--- a/src/World/terain.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef TERAIN_H
-#define TERAIN_H
-
-class Terain
-{
-public:
-
-private:
-
-};
-
-#endif
\ No newline at end of file