diff --git a/Include/Core/Classes/DecorativeObject.hpp b/Include/Core/Classes/DecorativeObject.hpp
index fdd3258..ef5938f 100644
--- a/Include/Core/Classes/DecorativeObject.hpp
+++ b/Include/Core/Classes/DecorativeObject.hpp
@@ -21,11 +21,11 @@ namespace Internal
             std::int32_t GetHash() const;
             std::int32_t GetOffsetX() const;
             std::int32_t GetOffsetY() const;
-            std::int32_t GetPlane() const;
             std::int32_t GetRenderInfo() const;
             Renderable GetRenderable() const;
             std::int32_t GetX() const;
             std::int32_t GetY() const;
+            std::int32_t GetZ() const;
 
     };
 }
diff --git a/Include/Core/Classes/GroundObject.hpp b/Include/Core/Classes/GroundObject.hpp
index 74fe7c6..6255393 100644
--- a/Include/Core/Classes/GroundObject.hpp
+++ b/Include/Core/Classes/GroundObject.hpp
@@ -17,11 +17,11 @@ namespace Internal
             static Class GetClass();
 
             std::int32_t GetHash() const;
-            std::int32_t GetPlane() const;
             std::int32_t GetRenderInfo() const;
             Renderable GetRenderable() const;
             std::int32_t GetX() const;
             std::int32_t GetY() const;
+            std::int32_t GetZ() const;
 
     };
 }
diff --git a/Include/Core/Classes/WallObject.hpp b/Include/Core/Classes/WallObject.hpp
index 6e71475..b3e3b96 100644
--- a/Include/Core/Classes/WallObject.hpp
+++ b/Include/Core/Classes/WallObject.hpp
@@ -20,10 +20,10 @@ namespace Internal
             std::int32_t GetFlags() const;
             std::int32_t GetHash() const;
             std::int32_t GetHeight() const;
-            std::int32_t GetPlane() const;
             Renderable GetRenderable() const;
             std::int32_t GetX() const;
             std::int32_t GetY() const;
+            std::int32_t GetZ() const;
 
     };
 }
diff --git a/Include/Game/Core.hpp b/Include/Game/Core.hpp
index e292521..420bd24 100644
--- a/Include/Game/Core.hpp
+++ b/Include/Game/Core.hpp
@@ -44,6 +44,8 @@
 #include "Interactable/GameObject.hpp"
 #include "Interactable/GroundObject.hpp"
 #include "Interactable/WallObject.hpp"
+#include "Interactable/Player.hpp"
+#include "Interactable/NPC.hpp"
 
 #include "Tools/RandomHandler.hpp"
 
diff --git a/Include/Game/Interactable/NPC.hpp b/Include/Game/Interactable/NPC.hpp
new file mode 100644
index 0000000..e7677d3
--- /dev/null
+++ b/Include/Game/Interactable/NPC.hpp
@@ -0,0 +1,33 @@
+#ifndef INTERACTABLENPC_HPP_INCLUDED
+#define INTERACTABLENPC_HPP_INCLUDED
+
+#include "../../Core/Classes/NPC.hpp"
+#include "../../Core/Classes/NPCInfo.hpp"
+#include "../../Core/Types/Tile.hpp"
+#include "../../Core/Types/Point.hpp"
+#include "../../Core/Types/Convex.hpp"
+#include <cstdint>
+
+namespace Interactable
+{
+    class NPC : public Internal::NPC
+    {
+        public:
+            NPC(const Internal::NPC& N);
+            NPC(const NPC& N);
+
+            std::int32_t GetID() const;
+            std::string GetName() const;
+            Tile GetTile() const;
+            Internal::NPCInfo GetInfo() const;
+            std::vector<Point> GetModel() const;
+            Convex GetConvex() const;
+            Internal::Character GetInteracting() const;
+            bool Interacting() const;
+            bool Interacting(const Internal::Character& C) const;
+
+            operator Internal::NPC() const;
+    };
+}
+
+#endif // INTERACTABLENPC_HPP_INCLUDED
diff --git a/Include/Game/Interactable/Player.hpp b/Include/Game/Interactable/Player.hpp
new file mode 100644
index 0000000..19aa33d
--- /dev/null
+++ b/Include/Game/Interactable/Player.hpp
@@ -0,0 +1,32 @@
+#ifndef INTERACTABLEPLAYER_HPP_INCLUDED
+#define INTERACTABLEPLAYER_HPP_INCLUDED
+
+#include "../../Core/Classes/Player.hpp"
+#include "../../Core/Classes/PlayerInfo.hpp"
+#include "../../Core/Types/Tile.hpp"
+#include "../../Core/Types/Point.hpp"
+#include "../../Core/Types/Convex.hpp"
+#include <cstdint>
+
+namespace Interactable
+{
+    class Player : public Internal::Player
+    {
+        public:
+            Player(const Internal::Player& P);
+            Player(const Player& P);
+
+            Tile GetTile() const;
+            Internal::PlayerInfo GetInfo() const;
+            std::vector<Point> GetModel() const;
+            Convex GetConvex() const;
+            Internal::Character GetInteracting() const;
+            bool Interacting() const;
+            bool Interacting(const Internal::Character& C) const;
+
+            operator Internal::Player() const;
+    };
+}
+
+
+#endif // INTERACTABLEPLAYER_HPP_INCLUDED
diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a
index 8ecef23..e9040f9 100644
Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ