diff --git a/15/15.fragment.glsl b/15/15.fragment.glsl
index 934426c..e8dfbaa 100644
--- a/15/15.fragment.glsl
+++ b/15/15.fragment.glsl
@@ -7,5 +7,5 @@ uniform sampler2D texture1;
 
 void main()
 {             
-    color = texture(texture1, TexCoords);
+    color = vec4(vec3(texture(texture1, TexCoords)), 1.0);
 }
diff --git a/15/depth_testing_example_app.cpp b/15/depth_testing_example_app.cpp
index 944bece..ddd8e89 100644
--- a/15/depth_testing_example_app.cpp
+++ b/15/depth_testing_example_app.cpp
@@ -1,218 +1,203 @@
 #include "c:/Users/samuel vishesh paul/documents/visual studio 2015/Projects/OpenGL Playground/OpenGL Playground/stdafx.h"
 
-class DepthTestingApp : public mylib::App
+#include "depth_testing_example_app.hpp"
+
+std::vector<GLfloat> DepthTestingApp::cubeVertices = {
+	-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
+	0.5f, -0.5f, -0.5f,  1.0f, 0.0f,
+	0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+	0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+	-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
+	-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
+
+	-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+	0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+	0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
+	0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
+	-0.5f,  0.5f,  0.5f,  0.0f, 1.0f,
+	-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+
+	-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+	-0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+	-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+	-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+	-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+	-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+
+	0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+	0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+	0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+	0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+	0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+	0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+
+	-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+	0.5f, -0.5f, -0.5f,  1.0f, 1.0f,
+	0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+	0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+	-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+	-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+
+	-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
+	0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+	0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+	0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+	-0.5f,  0.5f,  0.5f,  0.0f, 0.0f,
+	-0.5f,  0.5f, -0.5f,  0.0f, 1.0f
+};
+std::vector<GLfloat> DepthTestingApp::planeVertices = {
+	// Positions        // Texture Coords (note we set these higher 
+	// than 1 that together with GL_REPEAT as 
+	// texture wrapping mode will cause the 
+	// floor texture to repeat)
+	5.0f,  -0.5f,  5.0f,  2.0f, 0.0f,
+	-5.0f, -0.5f,  5.0f,  0.0f, 0.0f,
+	-5.0f, -0.5f, -5.0f,  0.0f, 2.0f,
+
+	5.0f,  -0.5f,  5.0f,  2.0f, 0.0f,
+	-5.0f, -0.5f, -5.0f,  0.0f, 2.0f,
+	5.0f,  -0.5f, -5.0f,  2.0f, 2.0f
+};
+
+DepthTestingApp::DepthTestingApp(mylib::Window&& window) : 
+	mylib::App(std::move(window))
+{}
+
+void DepthTestingApp::startup()
 {
-public:
-	std::vector<GLfloat> cubeVertices = {
-		-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
-		0.5f, -0.5f, -0.5f,  1.0f, 0.0f,
-		0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-		0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
-		-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
-
-		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-		0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-		0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
-		0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
-		-0.5f,  0.5f,  0.5f,  0.0f, 1.0f,
-		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-
-		-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-		-0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-		-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-
-		0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-		0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-		0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-		0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-		0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-		0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-
-		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-		0.5f, -0.5f, -0.5f,  1.0f, 1.0f,
-		0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-		0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
-		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
-		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
-
-		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
-		0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
-		0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-		0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
-		-0.5f,  0.5f,  0.5f,  0.0f, 0.0f,
-		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f
-	};
-	std::vector<GLfloat> planeVertices = {
-		// Positions        // Texture Coords (note we set these higher 
-							// than 1 that together with GL_REPEAT as 
-							// texture wrapping mode will cause the 
-							// floor texture to repeat)
-		5.0f,  -0.5f,  5.0f,  2.0f, 0.0f,
-		-5.0f, -0.5f,  5.0f,  0.0f, 0.0f,
-		-5.0f, -0.5f, -5.0f,  0.0f, 2.0f,
-
-		5.0f,  -0.5f,  5.0f,  2.0f, 0.0f,
-		-5.0f, -0.5f, -5.0f,  0.0f, 2.0f,
-		5.0f,  -0.5f, -5.0f,  2.0f, 2.0f
-	};
-	GLuint VAO[2]{ 0 }, VBO[2]{ 0 };
-	GLuint &cubeVAO = VAO[0], &planeVAO = VAO[1],
-		&cubeVBO = VBO[0], &planeVBO = VBO[1];
-	mylib::Shader shader, visualizeDepthShader;
-	mylib::Shader *activeShader{ nullptr };
-	GLuint cubeTex, floorTex;
-	mylib::Camera camera;
-	mylib::CameraController cameraController;
-	glm::mat4 model, view, projection;
-
-	int option{ 0 };
-
-	DepthTestingApp(mylib::Window&& window) : mylib::App(std::move(window))
-	{}
-
-	void startup() override
+	shader = mylib::Shader({
+		std::make_pair(
+			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.vertex.glsl",
+			GL_VERTEX_SHADER),
+		std::make_pair(
+			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.fragment.glsl",
+			GL_FRAGMENT_SHADER)
+	});
+	visualizeDepthShader = mylib::Shader({
+		std::make_pair(
+			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.vertex.glsl",
+			GL_VERTEX_SHADER),
+		std::make_pair(
+			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/visualizeDepth.fragment.glsl",
+			GL_FRAGMENT_SHADER)
+	});
+
+	glGenVertexArrays(2, VAO);
+	glGenBuffers(2, VBO);
+	glBindBuffer(GL_ARRAY_BUFFER, cubeVBO);
+	glBufferData(GL_ARRAY_BUFFER,
+		cubeVertices.size() * sizeof(*(cubeVertices.data())),
+		cubeVertices.data(),
+		GL_STATIC_DRAW);
+	glBindBuffer(GL_ARRAY_BUFFER, planeVBO);
+	glBufferData(GL_ARRAY_BUFFER,
+		planeVertices.size() * sizeof(*(planeVertices.data())),
+		planeVertices.data(),
+		GL_STATIC_DRAW);
+
+	// cube
+	glBindVertexArray(cubeVAO);
+	glBindBuffer(GL_ARRAY_BUFFER, cubeVBO);
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
+		5 * sizeof(*(cubeVertices.data())),
+		ML_BUFFER_OFFSET(0));
+	glEnableVertexAttribArray(1);
+	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE,
+		5 * sizeof(*(cubeVertices.data())),
+		ML_BUFFER_OFFSET(3 * sizeof(*(cubeVertices.data()))));
+	glBindVertexArray(0);
+	// plane
+	glBindVertexArray(planeVAO);
+	glBindBuffer(GL_ARRAY_BUFFER, planeVBO);
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
+		5 * sizeof(*(planeVertices.data())),
+		ML_BUFFER_OFFSET(0));
+	glEnableVertexAttribArray(1);
+	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE,
+		5 * sizeof(*(planeVertices.data())),
+		ML_BUFFER_OFFSET(3 * sizeof(*(planeVertices.data()))));
+	glBindVertexArray(0);
+
+	cubeTex = mylib::loadTexture(
+		"C:/Users/Samuel Vishesh Paul/Documents/GitHub/LearnOpenGL/resources/textures/marble.jpg");
+	floorTex = mylib::loadTexture(
+		"C:/Users/Samuel Vishesh Paul/Documents/GitHub/LearnOpenGL/resources/textures/metal.png");
+
+	camera = mylib::Camera(
+		glm::vec3(0.0f, 0.0f, 3.0f),	// cameraPos
+		glm::vec3(0.0f, 1.0f, 0.0f));	// cmaeraUp
+	cameraController = mylib::CameraController(
+		&camera, &window);
+
+	glEnable(GL_DEPTH_TEST);
+	glEnable(GL_STENCIL_TEST);
+}
+
+void DepthTestingApp::update(double time)
+{
+	cameraController.update(cameraController, time);
+	view = cameraController.camera->getViewMatrix();
+	projection = glm::perspective(
+		camera.zoom,
+		static_cast<GLfloat>(window.width) / window.height,
+		0.1f, 100.0f);
+
+	if (glfwGetKey(window.getWindow(), GLFW_KEY_1) == GLFW_PRESS)
+		option = 1;
+	else if (glfwGetKey(window.getWindow(), GLFW_KEY_2) == GLFW_PRESS)
+		option = 2;
+
+	switch (option)
 	{
-		shader = mylib::Shader({
-			std::make_pair(
-				"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.vertex.glsl",
-				GL_VERTEX_SHADER),
-			std::make_pair(
-				"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.fragment.glsl",
-				GL_FRAGMENT_SHADER)
-		});
-		visualizeDepthShader = mylib::Shader({
-			std::make_pair(
-				"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/15.vertex.glsl",
-				GL_VERTEX_SHADER),
-			std::make_pair(
-				"C:/Users/Samuel Vishesh Paul/Documents/GitHub/My-Jolly-journey/15/visualizeDepth.fragment.glsl",
-				GL_FRAGMENT_SHADER)
-		});
-
-		glGenVertexArrays(2, VAO);
-		glGenBuffers(2, VBO);
-		glBindBuffer(GL_ARRAY_BUFFER, cubeVBO);
-		glBufferData(GL_ARRAY_BUFFER, 
-			cubeVertices.size() * sizeof(*(cubeVertices.data())),
-			cubeVertices.data(),
-			GL_STATIC_DRAW);
-		glBindBuffer(GL_ARRAY_BUFFER, planeVBO);
-		glBufferData(GL_ARRAY_BUFFER,
-			planeVertices.size() * sizeof(*(planeVertices.data())),
-			planeVertices.data(),
-			GL_STATIC_DRAW);
-
-		// cube
-		glBindVertexArray(cubeVAO);
-		glBindBuffer(GL_ARRAY_BUFFER, cubeVBO);
-		glEnableVertexAttribArray(0);
-		glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
-			5 * sizeof(*(cubeVertices.data())),
-			ML_BUFFER_OFFSET(0));
-		glEnableVertexAttribArray(1);
-		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE,
-			5 * sizeof(*(cubeVertices.data())),
-			ML_BUFFER_OFFSET(3 * sizeof(*(cubeVertices.data()))));
-		glBindVertexArray(0);
-		// plane
-		glBindVertexArray(planeVAO);
-		glBindBuffer(GL_ARRAY_BUFFER, planeVBO);
-		glEnableVertexAttribArray(0);
-		glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
-			5 * sizeof(*(planeVertices.data())),
-			ML_BUFFER_OFFSET(0));
-		glEnableVertexAttribArray(1);
-		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE,
-			5 * sizeof(*(planeVertices.data())),
-			ML_BUFFER_OFFSET(3 * sizeof(*(planeVertices.data()))));
-		glBindVertexArray(0);
-
-		cubeTex = mylib::loadTexture(
-			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/LearnOpenGL/resources/textures/marble.jpg");
-		floorTex = mylib::loadTexture(
-			"C:/Users/Samuel Vishesh Paul/Documents/GitHub/LearnOpenGL/resources/textures/metal.png");
-
-		camera = mylib::Camera(
-			glm::vec3(0.0f, 0.0f, 3.0f),	// cameraPos
-			glm::vec3(0.0f, 1.0f, 0.0f));	// cmaeraUp
-		cameraController = mylib::CameraController(
-			&camera, &window);
-
-		glEnable(GL_DEPTH_TEST);
-		glEnable(GL_STENCIL_TEST);
+	case 1: {
+		activeShader = &shader;
+		break;
 	}
-
-	void update(double time) override
-	{
-		cameraController.update(cameraController, time);
-		view = cameraController.camera->getViewMatrix();
-		projection = glm::perspective(
-			camera.zoom,
-			static_cast<GLfloat>(window.width) / window.height,
-			0.1f, 100.0f);
-
-		if (glfwGetKey(window.getWindow(), GLFW_KEY_1) == GLFW_PRESS)
-			option = 1;
-		else if (glfwGetKey(window.getWindow(), GLFW_KEY_2) == GLFW_PRESS)
-			option = 2;
-
-		switch (option)
-		{
-		case 1: {
-			activeShader = &shader;
-			break;
-		}
-		case 2: {
-			activeShader = &visualizeDepthShader;
-			break;
-		}
-		default: {
-			activeShader = &shader;
-			break;
-		}
-		}
+	case 2: {
+		activeShader = &visualizeDepthShader;
+		break;
 	}
-
-	void render() override
-	{
-		glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
-		activeShader->use();
-		glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "projection"), 
-			1, GL_FALSE, glm::value_ptr(projection));
-		glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "view"), 
-			1, GL_FALSE, glm::value_ptr(view));
-		glBindVertexArray(cubeVAO);
-		glBindTexture(GL_TEXTURE_2D, cubeTex);
-		model = glm::translate(glm::mat4(), glm::vec3(-1.0f, 0.0f + 0.0001f, -1.0f));
-		glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"), 
-			1, GL_FALSE, glm::value_ptr(model));
-		glDrawArrays(GL_TRIANGLES, 0, 36);
-		model = glm::translate(glm::mat4(), glm::vec3(2.0f, 0.0f + 0.0001f, 0.0f));
-		glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"), 
-			1, GL_FALSE, glm::value_ptr(model));
-		glDrawArrays(GL_TRIANGLES, 0, 36);
-		// Floor
-		glBindVertexArray(planeVAO);
-		glBindTexture(GL_TEXTURE_2D, floorTex);
-		model = glm::translate(glm::mat4(), glm::vec3(0));
-		glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"), 
-			1, GL_FALSE, glm::value_ptr(model));
-		glDrawArrays(GL_TRIANGLES, 0, 6);
-		glBindVertexArray(0);
+	default: {
+		activeShader = &shader;
+		break;
 	}
-
-	void shutdown() override
-	{
-		glDeleteVertexArrays(2, VAO);
-		glDeleteBuffers(2, VBO);
 	}
+}
 
-private:
-
-};
+void DepthTestingApp::render()
+{
+	glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+	activeShader->use();
+	glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "projection"),
+		1, GL_FALSE, glm::value_ptr(projection));
+	glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "view"),
+		1, GL_FALSE, glm::value_ptr(view));
+	glBindVertexArray(cubeVAO);
+	glBindTexture(GL_TEXTURE_2D, cubeTex);
+	model = glm::translate(glm::mat4(), glm::vec3(-1.0f, 0.0f + 0.0001f, -1.0f));
+	glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"),
+		1, GL_FALSE, glm::value_ptr(model));
+	glDrawArrays(GL_TRIANGLES, 0, 36);
+	model = glm::translate(glm::mat4(), glm::vec3(2.0f, 0.0f + 0.0001f, 0.0f));
+	glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"),
+		1, GL_FALSE, glm::value_ptr(model));
+	glDrawArrays(GL_TRIANGLES, 0, 36);
+	// Floor
+	glBindVertexArray(planeVAO);
+	glBindTexture(GL_TEXTURE_2D, floorTex);
+	model = glm::translate(glm::mat4(), glm::vec3(0));
+	glUniformMatrix4fv(glGetUniformLocation(activeShader->program, "model"),
+		1, GL_FALSE, glm::value_ptr(model));
+	glDrawArrays(GL_TRIANGLES, 0, 6);
+	glBindVertexArray(0);
+}
+
+void DepthTestingApp::shutdown() 
+{
+	glDeleteVertexArrays(2, VAO);
+	glDeleteBuffers(2, VBO);
+}
diff --git a/15/depth_testing_example_app.hpp b/15/depth_testing_example_app.hpp
new file mode 100644
index 0000000..fe909c5
--- /dev/null
+++ b/15/depth_testing_example_app.hpp
@@ -0,0 +1,33 @@
+#include "c:/Users/samuel vishesh paul/documents/visual studio 2015/Projects/OpenGL Playground/OpenGL Playground/stdafx.h"
+
+class DepthTestingApp : public mylib::App
+{
+public:
+	static std::vector<GLfloat> cubeVertices;
+	static std::vector<GLfloat> planeVertices;
+	GLuint VAO[2]{ 0 }, VBO[2]{ 0 };
+	GLuint &cubeVAO = VAO[0], &planeVAO = VAO[1],
+		&cubeVBO = VBO[0], &planeVBO = VBO[1];
+	mylib::Shader shader, visualizeDepthShader;
+	mylib::Shader *activeShader{ nullptr };
+	GLuint cubeTex, floorTex;
+	mylib::Camera camera;
+	mylib::CameraController cameraController;
+	glm::mat4 model, view, projection;
+
+	int option{ 0 };
+
+	DepthTestingApp(mylib::Window&& window);
+
+	void startup() override;
+
+	void update(double time) override;
+
+	void render() override;
+
+	void shutdown() override;
+private:
+
+};
+
+