diff --git a/Game.cpp b/Game.cpp
index 0b330c9..de94440 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -85,13 +85,10 @@ void Game::LoadShaders()
 	pixelShader = std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SimplePixelShader.cso").c_str());
 
 	XMFLOAT3 white = XMFLOAT3(1.0f, 1.0f, 1.0f);
-	XMFLOAT3 deeppink = XMFLOAT3(1.0f, 0.08f, 0.4f);
-	XMFLOAT3 deepcoral = XMFLOAT3(1.0f, 0.39f, 0.22f);
 
 	materials = {
 		std::make_shared<Material>(white, 0, vertexShader, pixelShader),
-		std::make_shared<Material>(deeppink, 0, vertexShader, pixelShader),
-		std::make_shared<Material>(deepcoral, 0, vertexShader, pixelShader),
+		std::make_shared<Material>(white, 0, vertexShader, pixelShader),
 	};
 }
 
@@ -117,6 +114,11 @@ void Game::LoadTextures()
 
 	GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", deepFloorAlbedo);
 	GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", floorAlbedo);
+
+	materials[0]->PushSampler("BasicSampler", sampler);
+	materials[0]->PushTexture("Albedo", deepFloorAlbedo);
+	materials[1]->PushSampler("BasicSampler", sampler);
+	materials[1]->PushTexture("Albedo", floorAlbedo);
 }
 
 void Game::LoadLighting()
diff --git a/Material.cpp b/Material.cpp
index bacbf08..2ccbf54 100644
--- a/Material.cpp
+++ b/Material.cpp
@@ -32,6 +32,15 @@ void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera,
 	pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
 	pixelShader->CopyAllBufferData();
 	pixelShader->SetShader();
+
+	for (auto& t : textures)
+	{
+		pixelShader->SetShaderResourceView(t.first.c_str(), t.second.Get());
+	}
+	for (auto& s : samplers)
+	{
+		pixelShader->SetSamplerState(s.first.c_str(), s.second.Get());
+	}
 }
 
 DirectX::XMFLOAT3 Material::GetTint()
@@ -84,3 +93,13 @@ void Material::SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader)
 {
 	pixelShader = _pixelShader;
 }
+
+void Material::PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler)
+{
+	samplers.insert({ _name, _sampler });
+}
+
+void Material::PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture)
+{
+	textures.insert({ _name, _texture });
+}
diff --git a/Material.h b/Material.h
index 656f48a..b5b4bf9 100644
--- a/Material.h
+++ b/Material.h
@@ -33,9 +33,15 @@ public:
 	void									SetVertexShader(std::shared_ptr<SimpleVertexShader> _vertexShader);
 	void									SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader);
 
+	void									PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler);
+	void									PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture);
+
 private:
 	DirectX::XMFLOAT3						tint;
 	float									roughness;
 	std::shared_ptr<SimpleVertexShader>		vertexShader;
 	std::shared_ptr<SimplePixelShader>		pixelShader;
+
+	std::unordered_map<std::string, Microsoft::WRL::ComPtr<ID3D11SamplerState>>			samplers;
+	std::unordered_map<std::string, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView>>	textures;
 };