diff --git a/graphics/src/Animation.cpp b/graphics/src/Animation.cpp
diff --git a/graphics/src/animation_handler.cpp b/graphics/src/animation_handler.cpp
@@ -0,0 +1 @@
+#pragma once
diff --git a/graphics/src/game_scene.cpp b/graphics/src/game_scene.cpp
@@ -27,6 +27,11 @@ GameScene::GameScene(const char* file_name, MeshLib* mesh_lib)
 	models.emplace_back(glm::translate(model, vec3{ v[2], 0 }), vec3{ 0.1f, 0.1f, 0.9f}, mesh_lib->get_mesh(0));
 	models.emplace_back(glm::translate(model, vec3{ v[3], 0 }), vec3{ 0.9f, 0.8f, 0.1f}, mesh_lib->get_mesh(0));
 
+	for (unsigned int i = 0; i < 4; i++)
+	{
+		models[i].create_animation_data("Robot_run.sspAnim");
+	}
+
 	for (unsigned int i = 0; i < level.counterReader.levelObjectCount; i++)
 	{
 		glm::mat4 model{ 1.0f };

diff --git a/graphics/src/mesh_lib.cpp b/graphics/src/mesh_lib.cpp
@@ -18,7 +18,7 @@ void MeshLib::create_mesh_list()
 {
 	std::string meshLoader[] =
 	{
-		"Robot_1.0.ssp",				//0
+		"Robot.ssp",				//0
 		"Controlpanel_1_Wide.ssp",		//1
 		"Controlpanel_1_Wide.ssp",		//2
 		"Big_Wall.ssp",					//3

diff --git a/graphics/src/model.cpp b/graphics/src/model.cpp
@@ -34,7 +34,16 @@ void Model::render(const Shader & shader, const Camera& camera, const PointLight
 	shader.uniform("emissive_map", 5);
 	shader.uniform("player_color", emissive_color);
 
-
+	if (is_animated)
+	{
+		std::vector<glm::mat4> bone_mats = this->animation_handler->getMatrices();
+
+		for (int i = 0; i < bone_mats.size(); i++)
+		{
+			std::string name = "bone_mats[" + std::to_string(i) + "]";
+			shader.uniform(name, bone_mats[i]);
+		}
+	}
 
 
 	mesh->textures[0].bind(0);

diff --git a/resources/assets/Robot.ssp b/resources/assets/Robot.ssp
diff --git a/resources/assets/Robot_run.sspAnim b/resources/assets/Robot_run.sspAnim