diff --git a/win32/Contribs.props b/win32/Contribs.props
index 9e693c5a..cae28590 100644
--- a/win32/Contribs.props
+++ b/win32/Contribs.props
@@ -3,24 +3,28 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
+    <GlewDir>$(ContribDir)\glew-1.6.0</GlewDir>
     <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
     <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
     <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
     <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
     <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
+    <GlIncludes>$(GlewDir)\include</GlIncludes>
     <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
+    <GlLibs>$(GlewDir)\lib</GlLibs>
     <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
     <SdlLibs>$(SdlDir)\lib;$(SdlImageDir)\lib;$(SdlMixerDir)\lib</SdlLibs>
+    <GlDeps>opengl32.lib;glew32.lib</GlDeps>
     <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
     <SdlDeps>SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
+    <LolDefines>USE_GLEW</LolDefines>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />
   <ItemGroup>
-    <BuildMacro Include="ContribDir">
-      <Value>$(ContribDir)</Value>
-    </BuildMacro>
+    <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
+    <BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
     <BuildMacro Include="GtkDir">
       <Value>$(GtkDir)</Value>
     </BuildMacro>
@@ -36,23 +40,35 @@
     <BuildMacro Include="SdlMixerDir">
       <Value>$(SdlMixerDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlIncludes">
+      <Value>$(GlIncludes)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkIncludes">
       <Value>$(GtkIncludes)</Value>
     </BuildMacro>
     <BuildMacro Include="SdlIncludes">
       <Value>$(SdlIncludes)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlLibs">
+      <Value>$(GlLibs)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkLibs">
       <Value>$(GtkLibs)</Value>
     </BuildMacro>
     <BuildMacro Include="SdlLibs">
       <Value>$(SdlLibs)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlDeps">
+      <Value>$(GlDeps)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkDeps">
       <Value>$(GtkDeps)</Value>
     </BuildMacro>
     <BuildMacro Include="SdlDeps">
       <Value>$(SdlDeps)</Value>
     </BuildMacro>
+    <BuildMacro Include="LolDefines">
+      <Value>$(LolDefines)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/deushax.vcxproj b/win32/deushax.vcxproj
index 50c78b10..1bf64229 100644
--- a/win32/deushax.vcxproj
+++ b/win32/deushax.vcxproj
@@ -1,175 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\deushax\debugsprite.h" />
-    <ClInclude Include="..\deushax\game.h" />
-    <ClInclude Include="..\src\audio.h" />
-    <ClInclude Include="..\src\bitfield.h" />
-    <ClInclude Include="..\src\core.h" />
-    <ClInclude Include="..\src\debugfps.h" />
-    <ClInclude Include="..\src\debugquad.h" />
-    <ClInclude Include="..\src\debugrecord.h" />
-    <ClInclude Include="..\src\debugsphere.h" />
-    <ClInclude Include="..\src\debugstats.h" />
-    <ClInclude Include="..\src\dict.h" />
-    <ClInclude Include="..\src\emitter.h" />
-    <ClInclude Include="..\src\entity.h" />
-    <ClInclude Include="..\src\font.h" />
-    <ClInclude Include="..\src\forge.h" />
-    <ClInclude Include="..\src\hash.h" />
-    <ClInclude Include="..\src\image.h" />
-    <ClInclude Include="..\src\input.h" />
-    <ClInclude Include="..\src\layer.h" />
-    <ClInclude Include="..\src\loldebug.h" />
-    <ClInclude Include="..\src\lolgl.h" />
-    <ClInclude Include="..\src\map.h" />
-    <ClInclude Include="..\src\matrix.h" />
-    <ClInclude Include="..\src\numeric.h" />
-    <ClInclude Include="..\src\profiler.h" />
-    <ClInclude Include="..\src\sample.h" />
-    <ClInclude Include="..\src\sampler.h" />
-    <ClInclude Include="..\src\scene.h" />
-    <ClInclude Include="..\src\sdlapp.h" />
-    <ClInclude Include="..\src\sdlinput.h" />
-    <ClInclude Include="..\src\shader.h" />
-    <ClInclude Include="..\src\text.h" />
-    <ClInclude Include="..\src\ticker.h" />
-    <ClInclude Include="..\src\tiler.h" />
-    <ClInclude Include="..\src\tileset.h" />
-    <ClInclude Include="..\src\timer.h" />
-    <ClInclude Include="..\src\video.h" />
-    <ClInclude Include="..\src\worldentity.h" />
-    <ClInclude Include="..\src\world.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\deushax\debugsprite.cpp" />
-    <ClCompile Include="..\deushax\deushax.cpp" />
-    <ClCompile Include="..\deushax\game.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\debugfps.cpp" />
-    <ClCompile Include="..\src\debugquad.cpp" />
-    <ClCompile Include="..\src\debugrecord.cpp" />
-    <ClCompile Include="..\src\debugsphere.cpp" />
-    <ClCompile Include="..\src\debugstats.cpp" />
-    <ClCompile Include="..\src\dict.cpp" />
-    <ClCompile Include="..\src\emitter.cpp" />
-    <ClCompile Include="..\src\entity.cpp" />
-    <ClCompile Include="..\src\font.cpp" />
-    <ClCompile Include="..\src\forge.cpp" />
-    <ClCompile Include="..\src\hash.cpp" />
-    <ClCompile Include="..\src\image.cpp" />
-    <ClCompile Include="..\src\input.cpp" />
-    <ClCompile Include="..\src\layer.cpp" />
-    <ClCompile Include="..\src\map.cpp" />
-    <ClCompile Include="..\src\matrix.cpp" />
-    <ClCompile Include="..\src\profiler.cpp" />
-    <ClCompile Include="..\src\sample.cpp" />
-    <ClCompile Include="..\src\sampler.cpp" />
-    <ClCompile Include="..\src\scene.cpp" />
-    <ClCompile Include="..\src\sdlapp.cpp" />
-    <ClCompile Include="..\src\sdlinput.cpp" />
-    <ClCompile Include="..\src\shader.cpp" />
-    <ClCompile Include="..\src\text.cpp" />
-    <ClCompile Include="..\src\ticker.cpp" />
-    <ClCompile Include="..\src\tiler.cpp" />
-    <ClCompile Include="..\src\tileset.cpp" />
-    <ClCompile Include="..\src\timer.cpp" />
-    <ClCompile Include="..\src\video.cpp" />
-    <ClCompile Include="..\src\world.cpp" />
-    <ClCompile Include="..\src\worldentity.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>testmap</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Contribs.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Contribs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>Debug\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>Release\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\deushax\debugsprite.h" />
+    <ClInclude Include="..\deushax\game.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\deushax\debugsprite.cpp" />
+    <ClCompile Include="..\deushax\deushax.cpp" />
+    <ClCompile Include="..\deushax\game.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>testmap</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>Debug\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>Release\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/deushax.vcxproj.filters b/win32/deushax.vcxproj.filters
index 9d814c85..5be58283 100644
--- a/win32/deushax.vcxproj.filters
+++ b/win32/deushax.vcxproj.filters
@@ -1,224 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="lolengine">
-      <UniqueIdentifier>{61e63000-6bd2-43ea-ba80-b84c7afae0ae}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\bitfield.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugfps.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugquad.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugrecord.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugsphere.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugstats.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\dict.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\emitter.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\entity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\font.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\forge.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\hash.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\image.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\input.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\layer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\loldebug.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lolgl.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\map.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\matrix.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\numeric.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\profiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\scene.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlapp.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlinput.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\shader.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\text.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ticker.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tileset.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\timer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\video.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\worldentity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\world.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\deushax\debugsprite.h" />
-    <ClInclude Include="..\deushax\game.h" />
-    <ClInclude Include="..\src\sampler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sample.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\audio.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\debugfps.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugquad.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugrecord.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugsphere.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugstats.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dict.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\emitter.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\entity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\font.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\forge.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hash.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\image.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\input.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\layer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\map.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\matrix.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\profiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\scene.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlapp.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlinput.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\shader.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\text.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ticker.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tileset.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\timer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\video.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\world.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\worldentity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\deushax\debugsprite.cpp" />
-    <ClCompile Include="..\deushax\deushax.cpp" />
-    <ClCompile Include="..\deushax\game.cpp" />
-    <ClCompile Include="..\src\sample.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sampler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\audio.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="..\deushax\debugsprite.h" />
+    <ClInclude Include="..\deushax\game.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\deushax\debugsprite.cpp" />
+    <ClCompile Include="..\deushax\deushax.cpp" />
+    <ClCompile Include="..\deushax\game.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/editor.vcxproj b/win32/editor.vcxproj
index 6c7d3624..b691f240 100644
--- a/win32/editor.vcxproj
+++ b/win32/editor.vcxproj
@@ -13,80 +13,11 @@
   <ItemGroup>
     <ClInclude Include="..\deushax\gtk\glmapview.h" />
     <ClInclude Include="..\deushax\mapviewer.h" />
-    <ClInclude Include="..\src\audio.h" />
-    <ClInclude Include="..\src\bitfield.h" />
-    <ClInclude Include="..\src\core.h" />
-    <ClInclude Include="..\src\debugfps.h" />
-    <ClInclude Include="..\src\debugquad.h" />
-    <ClInclude Include="..\src\debugrecord.h" />
-    <ClInclude Include="..\src\debugsphere.h" />
-    <ClInclude Include="..\src\debugstats.h" />
-    <ClInclude Include="..\src\dict.h" />
-    <ClInclude Include="..\src\emitter.h" />
-    <ClInclude Include="..\src\entity.h" />
-    <ClInclude Include="..\src\font.h" />
-    <ClInclude Include="..\src\forge.h" />
-    <ClInclude Include="..\src\hash.h" />
-    <ClInclude Include="..\src\image.h" />
-    <ClInclude Include="..\src\input.h" />
-    <ClInclude Include="..\src\layer.h" />
-    <ClInclude Include="..\src\loldebug.h" />
-    <ClInclude Include="..\src\lolgl.h" />
-    <ClInclude Include="..\src\map.h" />
-    <ClInclude Include="..\src\matrix.h" />
-    <ClInclude Include="..\src\numeric.h" />
-    <ClInclude Include="..\src\profiler.h" />
-    <ClInclude Include="..\src\sample.h" />
-    <ClInclude Include="..\src\sampler.h" />
-    <ClInclude Include="..\src\scene.h" />
-    <ClInclude Include="..\src\sdlapp.h" />
-    <ClInclude Include="..\src\sdlinput.h" />
-    <ClInclude Include="..\src\shader.h" />
-    <ClInclude Include="..\src\text.h" />
-    <ClInclude Include="..\src\ticker.h" />
-    <ClInclude Include="..\src\tiler.h" />
-    <ClInclude Include="..\src\tileset.h" />
-    <ClInclude Include="..\src\timer.h" />
-    <ClInclude Include="..\src\video.h" />
-    <ClInclude Include="..\src\worldentity.h" />
-    <ClInclude Include="..\src\world.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\deushax\gtk\editor.cpp" />
     <ClCompile Include="..\deushax\gtk\glmapview.cpp" />
     <ClCompile Include="..\deushax\mapviewer.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\debugfps.cpp" />
-    <ClCompile Include="..\src\debugquad.cpp" />
-    <ClCompile Include="..\src\debugrecord.cpp" />
-    <ClCompile Include="..\src\debugsphere.cpp" />
-    <ClCompile Include="..\src\debugstats.cpp" />
-    <ClCompile Include="..\src\dict.cpp" />
-    <ClCompile Include="..\src\emitter.cpp" />
-    <ClCompile Include="..\src\entity.cpp" />
-    <ClCompile Include="..\src\font.cpp" />
-    <ClCompile Include="..\src\forge.cpp" />
-    <ClCompile Include="..\src\hash.cpp" />
-    <ClCompile Include="..\src\image.cpp" />
-    <ClCompile Include="..\src\input.cpp" />
-    <ClCompile Include="..\src\layer.cpp" />
-    <ClCompile Include="..\src\map.cpp" />
-    <ClCompile Include="..\src\matrix.cpp" />
-    <ClCompile Include="..\src\profiler.cpp" />
-    <ClCompile Include="..\src\sample.cpp" />
-    <ClCompile Include="..\src\sampler.cpp" />
-    <ClCompile Include="..\src\scene.cpp" />
-    <ClCompile Include="..\src\sdlapp.cpp" />
-    <ClCompile Include="..\src\sdlinput.cpp" />
-    <ClCompile Include="..\src\shader.cpp" />
-    <ClCompile Include="..\src\text.cpp" />
-    <ClCompile Include="..\src\ticker.cpp" />
-    <ClCompile Include="..\src\tiler.cpp" />
-    <ClCompile Include="..\src\tileset.cpp" />
-    <ClCompile Include="..\src\timer.cpp" />
-    <ClCompile Include="..\src\video.cpp" />
-    <ClCompile Include="..\src\world.cpp" />
-    <ClCompile Include="..\src\worldentity.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid>
@@ -133,14 +64,14 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
@@ -154,16 +85,16 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
@@ -172,4 +103,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32/editor.vcxproj.filters b/win32/editor.vcxproj.filters
index cdc55fa9..09186313 100644
--- a/win32/editor.vcxproj.filters
+++ b/win32/editor.vcxproj.filters
@@ -1,224 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="lolengine">
-      <UniqueIdentifier>{755186eb-cee6-4c2e-822f-24e728ac6fb8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\bitfield.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugfps.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugquad.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugrecord.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugsphere.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugstats.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\dict.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\emitter.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\entity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\font.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\forge.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\hash.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\image.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\input.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\layer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\loldebug.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lolgl.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\map.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\matrix.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\numeric.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\profiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\scene.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlapp.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlinput.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\shader.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\text.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ticker.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tileset.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\timer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\video.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\worldentity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\world.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sampler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sample.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\audio.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
     <ClInclude Include="..\deushax\gtk\glmapview.h" />
     <ClInclude Include="..\deushax\mapviewer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\debugfps.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugquad.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugrecord.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugsphere.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugstats.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dict.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\emitter.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\entity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\font.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\forge.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hash.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\image.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\input.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\layer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\map.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\matrix.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\profiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\scene.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlapp.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlinput.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\shader.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\text.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ticker.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tileset.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\timer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\video.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\world.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\worldentity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sample.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sampler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\audio.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
     <ClCompile Include="..\deushax\gtk\editor.cpp" />
     <ClCompile Include="..\deushax\gtk\glmapview.cpp" />
     <ClCompile Include="..\deushax\mapviewer.cpp" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj
new file mode 100644
index 00000000..bb7406b5
--- /dev/null
+++ b/win32/lolcore.vcxproj
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>lolcore</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="Contribs.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="Contribs.props" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\audio.cpp" />
+    <ClCompile Include="..\src\debug\fps.cpp" />
+    <ClCompile Include="..\src\debug\quad.cpp" />
+    <ClCompile Include="..\src\debug\record.cpp" />
+    <ClCompile Include="..\src\debug\sphere.cpp" />
+    <ClCompile Include="..\src\debug\stats.cpp" />
+    <ClCompile Include="..\src\dict.cpp" />
+    <ClCompile Include="..\src\eglapp.cpp" />
+    <ClCompile Include="..\src\emitter.cpp" />
+    <ClCompile Include="..\src\entity.cpp" />
+    <ClCompile Include="..\src\font.cpp" />
+    <ClCompile Include="..\src\forge.cpp" />
+    <ClCompile Include="..\src\gradient.cpp" />
+    <ClCompile Include="..\src\half.cpp" />
+    <ClCompile Include="..\src\hash.cpp" />
+    <ClCompile Include="..\src\image\image.cpp" />
+    <ClCompile Include="..\src\input.cpp" />
+    <ClCompile Include="..\src\layer.cpp" />
+    <ClCompile Include="..\src\log.cpp" />
+    <ClCompile Include="..\src\map.cpp" />
+    <ClCompile Include="..\src\matrix.cpp" />
+    <ClCompile Include="..\src\platform.cpp" />
+    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
+    <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\src\profiler.cpp" />
+    <ClCompile Include="..\src\sample.cpp" />
+    <ClCompile Include="..\src\sampler.cpp" />
+    <ClCompile Include="..\src\scene.cpp" />
+    <ClCompile Include="..\src\shader\shader.cpp" />
+    <ClCompile Include="..\src\sprite.cpp" />
+    <ClCompile Include="..\src\text.cpp" />
+    <ClCompile Include="..\src\ticker.cpp" />
+    <ClCompile Include="..\src\tiler.cpp" />
+    <ClCompile Include="..\src\tileset.cpp" />
+    <ClCompile Include="..\src\timer.cpp" />
+    <ClCompile Include="..\src\trig.cpp" />
+    <ClCompile Include="..\src\video.cpp" />
+    <ClCompile Include="..\src\world.cpp" />
+    <ClCompile Include="..\src\worldentity.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\audio.h" />
+    <ClInclude Include="..\src\bitfield.h" />
+    <ClInclude Include="..\src\core.h" />
+    <ClInclude Include="..\src\debug\fps.h" />
+    <ClInclude Include="..\src\debug\quad.h" />
+    <ClInclude Include="..\src\debug\record.h" />
+    <ClInclude Include="..\src\debug\sphere.h" />
+    <ClInclude Include="..\src\debug\stats.h" />
+    <ClInclude Include="..\src\dict.h" />
+    <ClInclude Include="..\src\eglapp.h" />
+    <ClInclude Include="..\src\emitter.h" />
+    <ClInclude Include="..\src\entity.h" />
+    <ClInclude Include="..\src\font.h" />
+    <ClInclude Include="..\src\forge.h" />
+    <ClInclude Include="..\src\gradient.h" />
+    <ClInclude Include="..\src\half.h" />
+    <ClInclude Include="..\src\hash.h" />
+    <ClInclude Include="..\src\image\image.h" />
+    <ClInclude Include="..\src\input.h" />
+    <ClInclude Include="..\src\layer.h" />
+    <ClInclude Include="..\src\log.h" />
+    <ClInclude Include="..\src\loldebug.h" />
+    <ClInclude Include="..\src\lolgl.h" />
+    <ClInclude Include="..\src\map.h" />
+    <ClInclude Include="..\src\matrix.h" />
+    <ClInclude Include="..\src\numeric.h" />
+    <ClInclude Include="..\src\platform.h" />
+    <ClInclude Include="..\src\platform\sdl\sdlapp.h" />
+    <ClInclude Include="..\src\platform\sdl\sdlinput.h" />
+    <ClInclude Include="..\src\profiler.h" />
+    <ClInclude Include="..\src\sample.h" />
+    <ClInclude Include="..\src\sampler.h" />
+    <ClInclude Include="..\src\scene.h" />
+    <ClInclude Include="..\src\shader\shader.h" />
+    <ClInclude Include="..\src\simd.h" />
+    <ClInclude Include="..\src\sprite.h" />
+    <ClInclude Include="..\src\text.h" />
+    <ClInclude Include="..\src\ticker.h" />
+    <ClInclude Include="..\src\tiler.h" />
+    <ClInclude Include="..\src\tileset.h" />
+    <ClInclude Include="..\src\timer.h" />
+    <ClInclude Include="..\src\trig.h" />
+    <ClInclude Include="..\src\video.h" />
+    <ClInclude Include="..\src\world.h" />
+    <ClInclude Include="..\src\worldentity.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/win32/lolcore.vcxproj.filters b/win32/lolcore.vcxproj.filters
new file mode 100644
index 00000000..162a5dc9
--- /dev/null
+++ b/win32/lolcore.vcxproj.filters
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="src\image">
+      <UniqueIdentifier>{940329fb-d054-433a-ae30-b7f409790554}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\debug">
+      <UniqueIdentifier>{e056731c-5484-434a-965e-801c199c0366}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\platform">
+      <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\shader">
+      <UniqueIdentifier>{ae7aa503-aea5-4aa6-9f61-2f92cfade09c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\platform\sdl">
+      <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\audio.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\dict.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\eglapp.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\emitter.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\entity.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\font.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\forge.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\gradient.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\half.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hash.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\input.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\layer.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\log.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\map.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\matrix.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\platform.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\profiler.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sampler.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scene.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sprite.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\text.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ticker.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tiler.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tileset.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\timer.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\trig.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\video.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\world.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\worldentity.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\image\image.cpp">
+      <Filter>src\image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug\fps.cpp">
+      <Filter>src\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug\quad.cpp">
+      <Filter>src\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug\record.cpp">
+      <Filter>src\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug\sphere.cpp">
+      <Filter>src\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug\stats.cpp">
+      <Filter>src\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shader\shader.cpp">
+      <Filter>src\shader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp">
+      <Filter>src\platform\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\platform\sdl\sdlinput.cpp">
+      <Filter>src\platform\sdl</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\audio.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\bitfield.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\dict.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\eglapp.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\emitter.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\entity.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\font.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\forge.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gradient.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\half.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\hash.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\input.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\layer.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\log.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\loldebug.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lolgl.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\map.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\matrix.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\numeric.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\profiler.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sample.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sampler.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\scene.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\simd.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sprite.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\text.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\ticker.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\tiler.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\tileset.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\timer.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\trig.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\video.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\world.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\worldentity.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\image\image.h">
+      <Filter>src\image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug\fps.h">
+      <Filter>src\debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug\quad.h">
+      <Filter>src\debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug\record.h">
+      <Filter>src\debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug\sphere.h">
+      <Filter>src\debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug\stats.h">
+      <Filter>src\debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shader\shader.h">
+      <Filter>src\shader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform\sdl\sdlinput.h">
+      <Filter>src\platform\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\platform\sdl\sdlapp.h">
+      <Filter>src\platform\sdl</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/lolengine.sln b/win32/lolengine.sln
index 3bb80c21..7aae6d02 100644
--- a/win32/lolengine.sln
+++ b/win32/lolengine.sln
@@ -1,32 +1,68 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
-		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32
-		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32
-		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.Build.0 = Debug|Win32
-		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
-		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
-		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32
-		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
-		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08C6A854-533D-4A1E-924E-C4A62281869F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
+		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32
+		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32
+		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.Build.0 = Debug|Win32
+		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
+		{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32
+		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32
+		{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32
+		{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32
+		{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9C66B179-0737-4BDA-AB42-2ADE478A9008} = {08C6A854-533D-4A1E-924E-C4A62281869F}
+		{EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F}
+		{17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC}
+		{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
+	EndGlobalSection
+EndGlobal
diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj
index 65c2b847..7452ca4e 100644
--- a/win32/monsterz.vcxproj
+++ b/win32/monsterz.vcxproj
@@ -1,184 +1,115 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\interface.h" />
-    <ClInclude Include="..\monsterz\mash.h" />
-    <ClInclude Include="..\monsterz\monsterz.h" />
-    <ClInclude Include="..\monsterz\piece.h" />
-    <ClInclude Include="..\monsterz\thumbs.h" />
-    <ClInclude Include="..\monsterz\title.h" />
-    <ClInclude Include="..\src\audio.h" />
-    <ClInclude Include="..\src\bitfield.h" />
-    <ClInclude Include="..\src\core.h" />
-    <ClInclude Include="..\src\debugfps.h" />
-    <ClInclude Include="..\src\debugquad.h" />
-    <ClInclude Include="..\src\debugrecord.h" />
-    <ClInclude Include="..\src\debugsphere.h" />
-    <ClInclude Include="..\src\debugstats.h" />
-    <ClInclude Include="..\src\dict.h" />
-    <ClInclude Include="..\src\emitter.h" />
-    <ClInclude Include="..\src\entity.h" />
-    <ClInclude Include="..\src\font.h" />
-    <ClInclude Include="..\src\forge.h" />
-    <ClInclude Include="..\src\hash.h" />
-    <ClInclude Include="..\src\image.h" />
-    <ClInclude Include="..\src\input.h" />
-    <ClInclude Include="..\src\layer.h" />
-    <ClInclude Include="..\src\loldebug.h" />
-    <ClInclude Include="..\src\lolgl.h" />
-    <ClInclude Include="..\src\map.h" />
-    <ClInclude Include="..\src\matrix.h" />
-    <ClInclude Include="..\src\numeric.h" />
-    <ClInclude Include="..\src\profiler.h" />
-    <ClInclude Include="..\src\sample.h" />
-    <ClInclude Include="..\src\sampler.h" />
-    <ClInclude Include="..\src\scene.h" />
-    <ClInclude Include="..\src\sdlapp.h" />
-    <ClInclude Include="..\src\sdlinput.h" />
-    <ClInclude Include="..\src\shader.h" />
-    <ClInclude Include="..\src\text.h" />
-    <ClInclude Include="..\src\ticker.h" />
-    <ClInclude Include="..\src\tiler.h" />
-    <ClInclude Include="..\src\tileset.h" />
-    <ClInclude Include="..\src\timer.h" />
-    <ClInclude Include="..\src\video.h" />
-    <ClInclude Include="..\src\worldentity.h" />
-    <ClInclude Include="..\src\world.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\interface.cpp" />
-    <ClCompile Include="..\monsterz\mash.cpp" />
-    <ClCompile Include="..\monsterz\monsterz.cpp" />
-    <ClCompile Include="..\monsterz\piece.cpp" />
-    <ClCompile Include="..\monsterz\thumbs.cpp" />
-    <ClCompile Include="..\monsterz\title.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\debugfps.cpp" />
-    <ClCompile Include="..\src\debugquad.cpp" />
-    <ClCompile Include="..\src\debugrecord.cpp" />
-    <ClCompile Include="..\src\debugsphere.cpp" />
-    <ClCompile Include="..\src\debugstats.cpp" />
-    <ClCompile Include="..\src\dict.cpp" />
-    <ClCompile Include="..\src\emitter.cpp" />
-    <ClCompile Include="..\src\entity.cpp" />
-    <ClCompile Include="..\src\font.cpp" />
-    <ClCompile Include="..\src\forge.cpp" />
-    <ClCompile Include="..\src\hash.cpp" />
-    <ClCompile Include="..\src\image.cpp" />
-    <ClCompile Include="..\src\input.cpp" />
-    <ClCompile Include="..\src\layer.cpp" />
-    <ClCompile Include="..\src\map.cpp" />
-    <ClCompile Include="..\src\matrix.cpp" />
-    <ClCompile Include="..\src\profiler.cpp" />
-    <ClCompile Include="..\src\sample.cpp" />
-    <ClCompile Include="..\src\sampler.cpp" />
-    <ClCompile Include="..\src\scene.cpp" />
-    <ClCompile Include="..\src\sdlapp.cpp" />
-    <ClCompile Include="..\src\sdlinput.cpp" />
-    <ClCompile Include="..\src\shader.cpp" />
-    <ClCompile Include="..\src\text.cpp" />
-    <ClCompile Include="..\src\ticker.cpp" />
-    <ClCompile Include="..\src\tiler.cpp" />
-    <ClCompile Include="..\src\tileset.cpp" />
-    <ClCompile Include="..\src\timer.cpp" />
-    <ClCompile Include="..\src\video.cpp" />
-    <ClCompile Include="..\src\world.cpp" />
-    <ClCompile Include="..\src\worldentity.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>testmap</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Contribs.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Contribs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>Debug\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>Release\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);opengl32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\monsterz\board.h" />
+    <ClInclude Include="..\monsterz\interface.h" />
+    <ClInclude Include="..\monsterz\mash.h" />
+    <ClInclude Include="..\monsterz\monsterz.h" />
+    <ClInclude Include="..\monsterz\piece.h" />
+    <ClInclude Include="..\monsterz\thumbs.h" />
+    <ClInclude Include="..\monsterz\title.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\monsterz\board.cpp" />
+    <ClCompile Include="..\monsterz\interface.cpp" />
+    <ClCompile Include="..\monsterz\mash.cpp" />
+    <ClCompile Include="..\monsterz\monsterz.cpp" />
+    <ClCompile Include="..\monsterz\piece.cpp" />
+    <ClCompile Include="..\monsterz\thumbs.cpp" />
+    <ClCompile Include="..\monsterz\title.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{17f0f184-4436-4d08-b8aa-16572ea238db}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>testmap</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>Debug\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>Release\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/monsterz.vcxproj.filters b/win32/monsterz.vcxproj.filters
index 6300c749..4008ffd9 100644
--- a/win32/monsterz.vcxproj.filters
+++ b/win32/monsterz.vcxproj.filters
@@ -1,233 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="lolengine">
-      <UniqueIdentifier>{9f9afde1-6605-49cb-b4f4-9b73eb8d8f4d}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\bitfield.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugfps.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugquad.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugrecord.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugsphere.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\debugstats.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\dict.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\emitter.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\entity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\font.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\forge.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\hash.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\image.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\input.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\layer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\loldebug.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lolgl.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\map.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\matrix.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\numeric.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\profiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\scene.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlapp.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sdlinput.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\shader.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\text.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ticker.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tiler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\tileset.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\timer.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\video.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\worldentity.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\world.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\interface.h" />
-    <ClInclude Include="..\monsterz\piece.h" />
-    <ClInclude Include="..\monsterz\thumbs.h" />
-    <ClInclude Include="..\monsterz\title.h" />
-    <ClInclude Include="..\src\sampler.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sample.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\monsterz\mash.h" />
-    <ClInclude Include="..\monsterz\monsterz.h" />
-    <ClInclude Include="..\src\audio.h">
-      <Filter>lolengine</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\debugfps.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugquad.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugrecord.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugsphere.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\debugstats.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dict.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\emitter.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\entity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\font.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\forge.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hash.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\image.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\input.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\layer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\map.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\matrix.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\profiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\scene.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlapp.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sdlinput.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\shader.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\text.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ticker.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tiler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tileset.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\timer.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\video.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\world.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\worldentity.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\interface.cpp" />
-    <ClCompile Include="..\monsterz\monsterz.cpp" />
-    <ClCompile Include="..\monsterz\piece.cpp" />
-    <ClCompile Include="..\monsterz\thumbs.cpp" />
-    <ClCompile Include="..\monsterz\title.cpp" />
-    <ClCompile Include="..\src\sampler.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sample.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\monsterz\mash.cpp" />
-    <ClCompile Include="..\src\audio.cpp">
-      <Filter>lolengine</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="..\monsterz\board.h" />
+    <ClInclude Include="..\monsterz\interface.h" />
+    <ClInclude Include="..\monsterz\piece.h" />
+    <ClInclude Include="..\monsterz\thumbs.h" />
+    <ClInclude Include="..\monsterz\title.h" />
+    <ClInclude Include="..\monsterz\mash.h" />
+    <ClInclude Include="..\monsterz\monsterz.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\monsterz\board.cpp" />
+    <ClCompile Include="..\monsterz\interface.cpp" />
+    <ClCompile Include="..\monsterz\monsterz.cpp" />
+    <ClCompile Include="..\monsterz\piece.cpp" />
+    <ClCompile Include="..\monsterz\thumbs.cpp" />
+    <ClCompile Include="..\monsterz\title.cpp" />
+    <ClCompile Include="..\monsterz\mash.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/quad.vcxproj b/win32/quad.vcxproj
new file mode 100644
index 00000000..3209f07f
--- /dev/null
+++ b/win32/quad.vcxproj
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\test\debug\quad.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>testmap</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Contribs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>Debug\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>Release\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file