diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
index a03446f..7f9c2d5 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
@@ -148,6 +148,7 @@
+
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
index 94202f3..7740421 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
@@ -144,6 +144,7 @@
GUI
+
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters.orig b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters.orig
new file mode 100644
index 0000000..80f772b
--- /dev/null
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters.orig
@@ -0,0 +1,204 @@
+
+
+
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+
+
+
+ GUI
+
+
+
+
+ GUI
+
+
+ GUI
+
+
+ GUI
+
+
+ GUI
+
+
+
+
+
+
+
+
+
+
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+ Systems
+
+
+
+ Components
+
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Components
+
+
+ Util
+
+
+ Util
+
+
+
+
+ GUI
+
+
+ GUI
+
+
+ GUI
+
+
+ GUI
+
+
+ GUI
+
+
+<<<<<<< HEAD
+
+=======
+
+
+
+>>>>>>> d0320477a978a38d87e94afbea65dc08fd10c860
+
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+ Shaders
+
+
+
+
+ {657e11f4-52e7-4336-b77f-80f00b85c33f}
+
+
+ {59929465-a139-43b9-9c75-48121d156e78}
+
+
+ {54f1eb6f-dc00-4e97-a3ef-ac255d755e2e}
+
+
+ {d985d7a7-c041-46fe-ae03-aa40295a7aad}
+
+
+ {7bdb0f69-049e-4f16-b271-2495e02e4b28}
+
+
+
\ No newline at end of file
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.orig b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.orig
new file mode 100644
index 0000000..7f9c2d5
--- /dev/null
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.orig
@@ -0,0 +1,183 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {FE405CFA-8FCE-4867-92CF-797E73B36482}
+ EscapetheDawn
+
+
+
+ Application
+ true
+ MultiByte
+ v110
+
+
+ Application
+ false
+ true
+ MultiByte
+ v110
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(BOOST_ROOT)\lib32-msvc-11.0;$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\lib\Win32\Debug;$(SolutionDir)\Libraries\SOIL\lib\Debug;$(SolutionDir)\Libraries\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Debug;$(LibraryPath)
+ $(SolutionDir)bin\
+ $(SolutionDir)obj\$(ProjectName)\
+ $(ProjectName)-$(Configuration)
+ $(BOOST_ROOT);$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\include;$(SolutionDir)\Libraries\SOIL\src;$(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)
+
+
+ $(BOOST_ROOT);$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\include;$(SolutionDir)\Libraries\SOIL\src;$(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)
+
+
+ $(BOOST_ROOT)\lib32-msvc-11.0;$(SolutionDir)\Libraries\openal-soft-1.15.1-bin\lib\Win32\Release;$(SolutionDir)\Libraries\SOIL\lib\Release;$(SolutionDir)\Libraries\glew-1.10.0\lib\Release\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Release;$(LibraryPath)
+ $(SolutionDir)bin\
+ $(SolutionDir)obj\$(ProjectName)\
+ $(ProjectName)-$(Configuration)
+
+
+
+ Level3
+ Disabled
+ GLEW_STATIC;DEBUG;%(PreprocessorDefinitions)
+ NotUsing
+
+
+ true
+ Console
+ OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32sd.lib;glfw3.lib;%(AdditionalDependencies)
+
+
+
+
+ OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32sd.lib;glfw3.lib
+
+
+
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ GLEW_STATIC;DEBUG;%(PreprocessorDefinitions)
+ NotUsing
+ ProgramDatabase
+ true
+
+
+ true
+ true
+ OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32s.lib;glfw3.lib;%(AdditionalDependencies)
+
+
+ OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32s.lib;glfw3.lib;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Escape-the-Dawn/Frame.cpp b/Escape-the-Dawn/Frame.cpp
index e69de29..bf996ed 100644
--- a/Escape-the-Dawn/Frame.cpp
+++ b/Escape-the-Dawn/Frame.cpp
@@ -0,0 +1,92 @@
+/*#include "Frame.h"
+
+GUI::Frame::Frame()
+{
+ rectangle = new Rectangle();
+}
+
+int GUI::Frame::GetWidth()
+{
+ return rectangle;
+}
+
+int GUI::Frame::GetHeight()
+{
+ return rectangle.Height();
+}
+
+int GUI::Frame::GetX()
+{
+ return rectangle;
+}
+
+int GUI::Frame::GetY()
+{
+ return rectangle.Y();
+}
+
+void GUI::Frame::SetWidth(int wid)
+{
+ rectangle.width(wid);
+}
+
+void GUI::Frame::SetHeight(int hei)
+{
+ rectangle.height(hei);
+}
+
+void GUI::Frame::SetX(int xcord)
+{
+ rectangle.X(xcord)
+}
+
+void GUI::Frame::SetY(int ycord)
+{
+ rectangle.Y(ycord)
+}
+
+Rectangle GUI::Frame::AbsouluteRectangle()
+{
+
+}
+
+bool GUI::Frame::Visible()
+{
+
+}
+
+int GUI::Frame::LayerSum()
+{
+
+}
+
+int GUI::Frame::UID()
+{
+
+}
+
+void GUI::Frame::AddChild(Frame childFrame)
+{
+
+}
+
+void GUI::Frame::RemoveChild(Frame childFrame)
+{
+
+}
+
+void GUI::Frame::Initialize()
+{
+
+}
+
+void GUI::Frame::Update(double dt)
+{
+
+}
+
+void GUI::Frame::Draw()
+{
+
+}
+*/
\ No newline at end of file
diff --git a/Escape-the-Dawn/Frame.h b/Escape-the-Dawn/Frame.h
index e69de29..2e9a3f4 100644
--- a/Escape-the-Dawn/Frame.h
+++ b/Escape-the-Dawn/Frame.h
@@ -0,0 +1,51 @@
+/*#ifndef Frame_h__
+#define Frame_h__
+
+#include