diff --git a/Game.cpp b/Game.cpp
index 49c6853..bcc27aa 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -91,8 +91,8 @@ void Game::LoadShaders()
 
 	materials = {
 		std::make_shared<Material>(white, 0, vertexShader, pixelShader),
-		std::make_shared<Material>(white, 0, vertexShader, pixelShader),
-		std::make_shared<Material>(white, 0, vertexShader, pixelShader),
+		std::make_shared<Material>(deeppink, 0, vertexShader, pixelShader),
+		std::make_shared<Material>(deepcoral, 0, vertexShader, pixelShader),
 	};
 }
 
@@ -114,10 +114,24 @@ void Game::LoadLighting()
 	directionalLight2.Direction = XMFLOAT3(-1, 1, -0.5f);
 	directionalLight2.Color = XMFLOAT3(0, 0, 1);
 	directionalLight2.Intensity = 1;
+	Light pointLight0 = {};
+	pointLight0.Type = LIGHT_TYPE_POINT;
+	pointLight0.Position = XMFLOAT3(-2, -2, 0);
+	pointLight0.Color = XMFLOAT3(1, 1, 0);
+	pointLight0.Intensity = 1;
+	pointLight0.Range = 10;
+	Light pointLight1 = {};
+	pointLight1.Type = LIGHT_TYPE_POINT;
+	pointLight1.Position = XMFLOAT3(2, 2, 0);
+	pointLight1.Color = XMFLOAT3(0, 1, 1);
+	pointLight1.Intensity = 1;
+	pointLight1.Range = 10;
 	lights = {
 		directionalLight0,
 		directionalLight1,
 		directionalLight2,
+		pointLight0,
+		pointLight1,
 	};
 }
 
@@ -137,27 +151,27 @@ void Game::CreateBasicGeometry()
 		std::make_shared<Mesh>(
 			GetFullPathTo("Assets/Models/helix.obj").c_str(),
 			device, context),
-		std::make_shared<Mesh>(
-			GetFullPathTo("Assets/Models/quad.obj").c_str(),
-			device, context),
-		std::make_shared<Mesh>(
-			GetFullPathTo("Assets/Models/quad_double_sided.obj").c_str(),
-			device, context),
 		std::make_shared<Mesh>(
 			GetFullPathTo("Assets/Models/sphere.obj").c_str(),
 			device, context),
 		std::make_shared<Mesh>(
 			GetFullPathTo("Assets/Models/torus.obj").c_str(),
 			device, context),
+		std::make_shared<Mesh>(
+			GetFullPathTo("Assets/Models/quad.obj").c_str(),
+			device, context),
+		std::make_shared<Mesh>(
+			GetFullPathTo("Assets/Models/quad_double_sided.obj").c_str(),
+			device, context),
 	};
 
 	entities = {
 		std::make_shared<Entity>(materials[0], shapes[0]),
-		std::make_shared<Entity>(materials[1], shapes[1]),
-		std::make_shared<Entity>(materials[2], shapes[2]),
+		std::make_shared<Entity>(materials[0], shapes[1]),
+		std::make_shared<Entity>(materials[0], shapes[2]),
 		std::make_shared<Entity>(materials[0], shapes[3]),
-		std::make_shared<Entity>(materials[1], shapes[4]),
-		std::make_shared<Entity>(materials[2], shapes[5]),
+		std::make_shared<Entity>(materials[0], shapes[4]),
+		std::make_shared<Entity>(materials[0], shapes[5]),
 		std::make_shared<Entity>(materials[0], shapes[6]),
 	};
 
diff --git a/Helpers.hlsli b/Helpers.hlsli
index 0a6244b..99e296a 100644
--- a/Helpers.hlsli
+++ b/Helpers.hlsli
@@ -31,4 +31,11 @@ float getDiffuse(float3 normal, float3 direction)
 	return saturate(dot(normal, direction));
 }
 
+float getAttenuation(float3 pointPosition, float3 worldPosition, float3 range)
+{
+	float dist = distance(pointPosition, worldPosition);
+	float attn = saturate(1.0f - (dist * dist / (range * range)));
+	return attn * attn;
+}
+
 #endif
diff --git a/SimplePixelShader.hlsl b/SimplePixelShader.hlsl
index d986fcb..2443ab5 100644
--- a/SimplePixelShader.hlsl
+++ b/SimplePixelShader.hlsl
@@ -3,7 +3,7 @@
 #include "Lights.hlsli"
 
 // temporary
-#define LIGHT_COUNT 3
+#define LIGHT_COUNT 5
 
 cbuffer ExternalData : register(b0)
 {
@@ -32,6 +32,16 @@ float3 calculateDirectionalLight(Light light, float3 normal, float3 worldPositio
 	return (diffuse * surfaceColor + specular) * light.Intensity * light.Color;
 }
 
+float3 calculatePointLight(Light light, float3 normal, float3 worldPosition, float3 cameraPosition, float roughness, float3 surfaceColor)
+{
+	float3 lightDirection = normalize(worldPosition - light.Position);
+	float attenuation = getAttenuation(light.Position, worldPosition, light.Range);
+	float diffuse = getDiffuse(normal, -lightDirection);
+	float specular = calculateSpecular(normal, lightDirection, worldPosition, cameraPosition, roughness);
+
+	return (diffuse * surfaceColor + specular) * attenuation * light.Intensity * light.Color;
+}
+
 float4 main(VertexToPixel input) : SV_TARGET
 {
 	input.normal = normalize(input.normal);
@@ -44,6 +54,9 @@ float4 main(VertexToPixel input) : SV_TARGET
 		case LIGHT_TYPE_DIRECTIONAL:
 			light += calculateDirectionalLight(lights[i], input.normal, input.worldPosition, cameraPosition, roughness, tint);
 			break;
+		case LIGHT_TYPE_POINT:
+			light += calculatePointLight(lights[i], input.normal, input.worldPosition, cameraPosition, roughness, tint);
+			break;
 		}
 	}