Fixed level loading

Added getMass to part
2019-10-26 17:19:45 -04:00 · 2019-10-26 15:54:48 -04:00
172 changed files with 4262 additions and 10559 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,4 @@ G3DTest.suo
 G3DTest.suo
 stderr.txt
 desktop.ini
-*.db
+main.cpp
 #Redist
 !Installer/Redist/*
--- a/src/source/AudioPlayer.cpp
+++ b/src/source/AudioPlayer.cpp
--- a/src/include/AudioPlayer.h
+++ b/src/include/AudioPlayer.h
--- a/B3dIcon.ico
+++ b/B3dIcon.ico
--- a/src/source/DataModelV2/BaseButtonInstance.cpp
+++ b/src/source/DataModelV2/BaseButtonInstance.cpp
@@ -1,6 +1,5 @@
-#include "DataModelV2/BaseButtonInstance.h"
+#include "BaseButtonInstance.h"
 #include "Globals.h"
 #include "Application.h"
 ButtonListener* listener = NULL;
@@ -13,19 +12,20 @@ BaseButtonInstance::BaseButtonInstance(void)
 void BaseButtonInstance::render(RenderDevice* rd)
 {
-	DataModelInstance* dataModel = g_dataModel;
+	DataModelInstance* dataModel = Globals::dataModel;
-	Vector2 pos = Vector2(g_usableApp->mouse.x,g_usableApp->mouse.y);
+	Vector2 pos = Vector2(dataModel->mousex,dataModel->mousey);
-	drawObj(rd, pos, g_usableApp->mouse.isMouseDown());
+	drawObj(rd, pos, dataModel->mouseButton1Down);
 	Instance::render(rd);
 }
 BaseButtonInstance::~BaseButtonInstance(void)
 {
 	delete listener;
 }
-void BaseButtonInstance::setButtonListener(ButtonListener& buttonListener)
+void BaseButtonInstance::setButtonListener(ButtonListener* buttonListener)
 {
-	listener = &buttonListener;
+	listener = buttonListener;
 }
 void BaseButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown){}
@@ -37,6 +37,7 @@ void BaseButtonInstance::onMouseClick()
 	if(listener != NULL)
 	{
 		listener->onButton1MouseClick(this);
 	}
 }
--- a/src/include/DataModelV2/BaseButtonInstance.h
+++ b/src/include/DataModelV2/BaseButtonInstance.h
@@ -1,10 +1,8 @@
 #pragma once
-#include "Instance.h"
+#include "instance.h"
-#include "Listener/ButtonListener.h"
+#pragma once
-
+#include "ButtonListener.h"
 class ButtonListener;
 class Instance;
 class BaseButtonInstance : public Instance
 {
 public:
@@ -14,7 +12,7 @@ public:
 	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
 	virtual bool mouseInButton(float, float, RenderDevice* rd);
 	virtual void onMouseClick();
-	void setButtonListener(ButtonListener&);
+	void setButtonListener(ButtonListener*);
 	bool floatBottom;
 	bool floatRight;
 	bool floatCenter;
--- a/Blocks3D.vcproj
+++ b/Blocks3D.vcproj
@@ -1,925 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="Blocks3D"
 	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
 	RootNamespace="Blocks3D"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
 				TypeLibraryName=".\Release/Blocks3D.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="4105"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib OPCODE.lib Ole32.lib"
 				OutputFile="./Blocks3D.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
 				OutputFile=".\Release/Blocks3D.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			ManagedExtensions="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
 				TypeLibraryName=".\Debug/Blocks3D.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;C:\libraries\ode-0.5\include\drawstuff&quot;;.\src\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="false"
 				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="4105"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib ode.lib OPCODE.lib"
 				OutputFile="./Blocks3D-Debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
 				OutputFile=".\Debug/Blocks3D.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 		<AssemblyReference
 			RelativePath="System.dll"
 			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.Data.dll"
 			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
 		/>
 		<AssemblyReference
 			RelativePath="System.Drawing.dll"
 			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.Windows.Forms.dll"
 			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.XML.dll"
 			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath=".\src\source\Application.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\AudioPlayer.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\ax.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\BrowserCallHandler.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\CameraController.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\ErrorFunctions.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\Globals.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\IEBrowser.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\IEDispatcher.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\main.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\Mouse.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\propertyGrid.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\PropertyWindow.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\Renderer.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\StringFunctions.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\TextureHandler.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\src\source\WindowFunctions.cpp"
 				>
 			</File>
 			<Filter
 				Name="Tool"
 				>
 				<File
 					RelativePath=".\src\source\Tool\ArrowTool.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Tool\SurfaceTool.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Tool\Tool.cpp"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="Listener"
 				>
 				<File
 					RelativePath=".\src\source\Listener\ButtonListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\DeleteListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Listener\ToolbarListener.cpp"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="DataModelV2"
 				>
 				<File
 					RelativePath=".\src\source\DataModelV2\DataModelInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\GroupInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\Instance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\LevelInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\PartInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\PVInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							ObjectFile="$(IntDir)\$(InputName)1.obj"
 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 						/>
 					</FileConfiguration>
 				</File>
 				<Filter
 					Name="Gui"
 					>
 					<File
 						RelativePath=".\src\source\DataModelV2\BaseButtonInstance.cpp"
 						>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 					</File>
 					<File
 						RelativePath=".\src\source\DataModelV2\BaseGuiInstance.cpp"
 						>
 					</File>
 					<File
 						RelativePath=".\src\source\DataModelV2\GuiRootInstance.cpp"
 						>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 					</File>
 					<File
 						RelativePath=".\src\source\DataModelV2\ImageButtonInstance.cpp"
 						>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 					</File>
 					<File
 						RelativePath=".\src\source\DataModelV2\TextButtonInstance.cpp"
 						>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 					</File>
 					<File
 						RelativePath=".\src\source\DataModelV2\ToggleImageButtonInstance.cpp"
 						>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								ObjectFile="$(IntDir)\$(InputName)1.obj"
 								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 							/>
 						</FileConfiguration>
 					</File>
 				</Filter>
 				<Filter
 					Name="XplicitNgine"
 					>
 					<File
 						RelativePath=".\src\source\XplicitNgine\XplicitNgine.cpp"
 						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="Properties"
 				>
 				<File
 					RelativePath=".\src\source\Properties\BoolProperty.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\source\Properties\Property.cpp"
 					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
 				RelativePath=".\src\include\Application.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\AudioPlayer.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\ax.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\BrowserCallHandler.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\CameraController.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\Enum.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\ErrorFunctions.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\Faces.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\Globals.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\IEBrowser.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\IEDispatcher.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\Mouse.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\propertyGrid.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\PropertyWindow.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\Renderer.h"
 				>
 			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\StringFunctions.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\TextureHandler.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\win32Defines.h"
 				>
 			</File>
 			<File
 				RelativePath=".\src\include\WindowFunctions.h"
 				>
 			</File>
 			<Filter
 				Name="RapidXML"
 				>
 				<File
 					RelativePath=".\src\include\rapidxml\rapidxml.hpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="Listener"
 				>
 				<File
 					RelativePath=".\src\include\Listener\ButtonListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\CameraButtonListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\DeleteListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\GUDButtonListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\MenuButtonListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\ModeSelectionListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\RotateButtonListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Listener\ToolbarListener.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModel\WorkspaceInstance.h"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="Tool"
 				>
 				<File
 					RelativePath=".\src\include\Tool\ArrowTool.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Tool\SurfaceTool.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Tool\Tool.h"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="DataModelV2"
 				>
 				<File
 					RelativePath=".\src\include\DataModelV2\DataModelInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\GroupInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\Instance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\LevelInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\PartInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\PVInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h"
 					>
 				</File>
 				<Filter
 					Name="Gui"
 					>
 					<File
 						RelativePath=".\src\include\DataModelV2\BaseButtonInstance.h"
 						>
 					</File>
 					<File
 						RelativePath=".\src\include\DataModelV2\BaseGuiInstance.h"
 						>
 					</File>
 					<File
 						RelativePath=".\src\include\DataModelV2\GuiRootInstance.h"
 						>
 					</File>
 					<File
 						RelativePath=".\src\include\DataModelV2\ImageButtonInstance.h"
 						>
 					</File>
 					<File
 						RelativePath=".\src\include\DataModelV2\TextButtonInstance.h"
 						>
 					</File>
 					<File
 						RelativePath=".\src\include\DataModelV2\ToggleImageButtonInstance.h"
 						>
 					</File>
 				</Filter>
 				<Filter
 					Name="XplicitNgine"
 					>
 					<File
 						RelativePath=".\src\include\XplicitNgine\XplicitNgine.h"
 						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="Properties"
 				>
 				<File
 					RelativePath=".\src\include\Properties\BoolProperty.h"
 					>
 				</File>
 				<File
 					RelativePath=".\src\include\Properties\Property.h"
 					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>
 			</File>
 			<File
 				RelativePath=".\icon1.ico"
 				>
 			</File>
 			<File
 				RelativePath=".\Parts.bmp"
 				>
 			</File>
 			<File
 				RelativePath=".\roblox_RN1_icon.ico"
 				>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 		<Global
 			Name="RESOURCE_FILE"
 			Value="Dialogs.rc"
 		/>
 	</Globals>
 </VisualStudioProject>
--- a/src/source/BrowserCallHandler.cpp
+++ b/src/source/BrowserCallHandler.cpp
--- a/src/include/BrowserCallHandler.h
+++ b/src/include/BrowserCallHandler.h
--- a/src/source/Listener/ButtonListener.cpp
+++ b/src/source/Listener/ButtonListener.cpp
@@ -1,10 +1,8 @@
-#include "DataModelV2/BaseButtonInstance.h"
+#include "ButtonListener.h"
 #include "Listener/ButtonListener.h"
 ButtonListener::ButtonListener()
 {
 	doDelete = true;
 }
 ButtonListener::~ButtonListener(void)
--- a/ButtonListener.h
+++ b/ButtonListener.h
@@ -0,0 +1,20 @@
 #pragma once
 #include "Demo.h"
 #include "BaseButtonInstance.h"
 class BaseButtonInstance;
 class ButtonListener
 {
 public:
 	ButtonListener();
 	~ButtonListener(void);
 	virtual void onButton1MouseClick(BaseButtonInstance*);
 	//virtual void onMouseOver(); //TODO
 	//virtual void onMouseOut(); //TODO
 	//virtual void onButton1MouseDown(); //TODO
 	//virtual void onButton1MouseUp(); //TODO
 	//virtual void onButton2MouseClick(); //TODO
 	//virtual void onButton2MouseDown(); //TODO
 	//virtual void onButton2MouseUp(); //TODO
 	//What to do now...
 };
--- a/src/source/CameraController.cpp
+++ b/src/source/CameraController.cpp
@@ -1,8 +1,8 @@
 #include "CameraController.h"
 #include "win32Defines.h"
 #include <iostream>
-#include "DataModelV2/PartInstance.h"
+#include "PartInstance.h"
-#include "Application.h"
+#include "Demo.h"
 #include "AudioPlayer.h"
@@ -57,35 +57,6 @@ void CameraController::refreshZoom(const CoordinateFrame& frame)
 void CameraController::pan(CoordinateFrame* frame,float spdX, float spdY)
 {
 		yaw+=spdX;
 		pitch+=spdY;
 		if (pitch>1.4f) pitch=1.4f;
 		if (pitch<-1.4f) pitch=-1.4f;
 		frame->translation = Vector3(sin(-yaw)*zoom*cos(pitch),sin(pitch)*zoom,cos(-yaw)*zoom*cos(pitch))+focusPosition;
 		frame->lookAt(focusPosition);
 }
 void CameraController::panLock(CoordinateFrame* frame,float spdX, float spdY)
 {
 		int sign = 0;	
 		yaw = toDegrees(yaw);
 		if((((yaw - fmod(yaw, 45)) / 45) * 45) < 0)
 		{
 			sign = 1;
 		}
 		yaw = fabs(yaw);
 		yaw = ((yaw - fmod(yaw, 45)) / 45) * 45;
 		yaw = toRadians(yaw);
 		if(sign==1)
 		{
 			yaw = yaw * -1;
 		}
 		yaw+=spdX;
 		pitch+=spdY;
@@ -134,14 +105,14 @@ void CameraController::Zoom(short delta)
 void CameraController::panLeft()
 {
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
-	panLock(&frame,toRadians(-45),0);
+	pan(&frame,toRadians(-45),0);
 	setFrame(frame);
 }
 void CameraController::panRight()
 {
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
-	panLock(&frame,toRadians(45),0);
+	pan(&frame,toRadians(45),0);
 	setFrame(frame);
 }
@@ -159,11 +130,6 @@ void CameraController::tiltDown()
 	setFrame(frame);
 }
 void CameraController::zoomExtents() 
 {
 	// do some weird jank math
 }
 void CameraController::centerCamera(Instance* selection)
 {
 	CoordinateFrame frame = CoordinateFrame(g3dCamera.getCoordinateFrame().translation);
@@ -174,7 +140,7 @@ void CameraController::centerCamera(Instance* selection)
 	}
 	else if(PartInstance* part = dynamic_cast<PartInstance*>(selection))
 	{
-		Vector3 partPos = (part)->getPosition();
+		Vector3 partPos = (part)->getPosition()/2;
 		lookAt(partPos);
 		focusPosition=partPos;
 		zoom=((partPos-frame.translation).magnitude());
@@ -186,7 +152,7 @@ void CameraController::centerCamera(Instance* selection)
 	}
 }
-void CameraController::update(Application* app)
+void CameraController::update(Demo* demo)
 {
 	float offsetSize = 0.05F;
--- a/src/include/CameraController.h
+++ b/src/include/CameraController.h
@@ -1,14 +1,14 @@
 #pragma once
 #include <G3DAll.h>
-#include "DataModelV2/Instance.h"
+#include "Instance.h"
 #include "Globals.h"
 #include <string>
 #define CAM_ZOOM_MIN 0.1f
 #define CAM_ZOOM_MAX 100.f
-class Application;
+class Demo;
 class CameraController {
 	public:
@@ -19,14 +19,12 @@ class CameraController {
 		void lookAt(const Vector3& position);
 		void refreshZoom(const CoordinateFrame& frame);
 		void pan(CoordinateFrame* frame,float spdX,float spdY);
-		void panLock(CoordinateFrame* frame,float spdX,float spdY);
+		void update(Demo* demo);
 		void update(Application* app);
 		void centerCamera(Instance* selection);
 		void panLeft();
 		void panRight();
 		void tiltUp();
 		void tiltDown();
 		void zoomExtents();
 		void Zoom(short delta);
 		bool onMouseWheel(int x, int y, short delta);
 		GCamera* getCamera();
--- a/DataModelInstance.cpp
+++ b/DataModelInstance.cpp
@@ -0,0 +1,551 @@
 #include <string>
 #include "DataModelInstance.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <commdlg.h>
 using namespace std;
 using namespace rapidxml;
 DataModelInstance::DataModelInstance(void)
 {
 	Instance::Instance();
 	workspace = new WorkspaceInstance();
 	guiRoot = new Instance();
 	level = new LevelInstance();
 	//children.push_back(workspace);
 	//children.push_back(level);
 	className = "dataModel";
 	mousex = 0;
 	mousey = 0;
 	mouseButton1Down = false;
 	showMessage = false;
 	canDelete = false;
 	_modY=0;
 	workspace->setParent(this);
 	level->setParent(this);
 	_loadedFileName="..//skooter.rbxm";
 }
 DataModelInstance::~DataModelInstance(void)
 {
 }
 #ifdef _DEBUG
 void DataModelInstance::modXMLLevel(float modY)
 {
 	_modY += modY;
 	clearLevel();
 	debugGetOpen();
 }
 #endif
 void DataModelInstance::clearLevel()
 {
 	workspace->clearChildren();
 }
 PartInstance* DataModelInstance::makePart()
 {
 	PartInstance* part = new PartInstance();
 	return part;
 }
 rapidxml::xml_node<>* DataModelInstance::getNode(xml_node<> * node,const char* name)
 {
 	xml_node<> * tempNode = node->first_node(name);
 	if (!tempNode)
 	{
 		_errMsg = "Expected <";
 		_errMsg += name;
 		_errMsg+="> tag.";
 		_successfulLoad=true;
 		return 0;
 	}
 	return tempNode;
 }
 float DataModelInstance::getFloatValue(xml_node<> * node,const char* name)
 {
 	xml_node<> * tempNode = node->first_node(name);
 	if (!tempNode)
 	{
 		_errMsg = "Expected <";
 		_errMsg += name;
 		_errMsg+="> tag.";
 		_successfulLoad=true;
 		return 0;
 	}
 	float newFloat;
 	stringstream converter;
 	converter << tempNode->value();
 	converter >> newFloat;
 	return newFloat;
 }
 Color3 bcToRGB(short bc)
 {
 	switch(bc)
 	{
 		case 1: return Color3(0.94901967048645,0.95294123888016,0.95294123888016);
 		case 2: return Color3(0.63137257099152,0.64705884456635,0.63529413938522);
 		case 3: return Color3(0.9764706492424,0.91372555494308,0.60000002384186);
 		case 5: return Color3(0.84313732385635,0.77254909276962,0.60392159223557);
 		case 6: return Color3(0.7607843875885,0.85490202903748,0.72156864404678);
 		case 9: return Color3(0.90980398654938,0.7294117808342,0.78431379795074);
 		case 11: return Color3(0.50196081399918,0.73333334922791,0.85882359743118);
 		case 12: return Color3(0.79607850313187,0.51764708757401,0.258823543787);
 		case 18: return Color3(0.80000007152557,0.55686277151108,0.41176474094391);
 		case 21: return Color3(0.76862752437592,0.15686275064945,0.10980392992496);
 		case 22: return Color3(0.76862752437592,0.43921571969986,0.62745100259781);
 		case 23: return Color3(0.050980396568775,0.41176474094391,0.6745098233223);
 		case 24: return Color3(0.96078437566757,0.80392163991928,0.18823531270027);
 		case 25: return Color3(0.38431376218796,0.27843138575554,0.19607844948769);
 		case 26: return Color3(0.10588236153126,0.16470588743687,0.20784315466881);
 		case 27: return Color3(0.42745101451874,0.43137258291245,0.42352944612503);
 		case 28: return Color3(0.15686275064945,0.49803924560547,0.27843138575554);
 		case 29: return Color3(0.63137257099152,0.76862752437592,0.54901963472366);
 		case 36: return Color3(0.95294123888016,0.8117647767067,0.60784316062927);
 		case 37: return Color3(0.29411765933037,0.59215688705444,0.29411765933037);
 		case 38: return Color3(0.62745100259781,0.37254902720451,0.20784315466881);
 		case 39: return Color3(0.75686281919479,0.79215693473816,0.8705883026123);
 		case 40: return Color3(0.92549026012421,0.92549026012421,0.92549026012421);
 		case 41: return Color3(0.80392163991928,0.32941177487373,0.29411765933037);
 		case 42: return Color3(0.75686281919479,0.87450987100601,0.94117653369904);
 		case 43: return Color3(0.48235297203064,0.71372550725937,0.90980398654938);
 		case 44: return Color3(0.96862751245499,0.94509810209274,0.55294120311737);
 		case 45: return Color3(0.70588237047195,0.82352948188782,0.89411771297455);
 		case 47: return Color3(0.85098046064377,0.52156865596771,0.42352944612503);
 		case 48: return Color3(0.51764708757401,0.71372550725937,0.55294120311737);
 		case 49: return Color3(0.97254908084869,0.94509810209274,0.51764708757401);
 		case 50: return Color3(0.92549026012421,0.90980398654938,0.8705883026123);
 		case 100: return Color3(0.93333339691162,0.76862752437592,0.71372550725937);
 		case 101: return Color3(0.85490202903748,0.52549022436142,0.47843140363693);
 		case 102: return Color3(0.43137258291245,0.60000002384186,0.79215693473816);
 		case 103: return Color3(0.78039222955704,0.75686281919479,0.71764707565308);
 		case 104: return Color3(0.41960787773132,0.19607844948769,0.48627454042435);
 		case 105: return Color3(0.88627457618713,0.60784316062927,0.25098040699959);
 		case 106: return Color3(0.85490202903748,0.52156865596771,0.2549019753933);
 		case 107: return Color3(0,0.56078433990479,0.61176472902298);
 		case 108: return Color3(0.4078431725502,0.36078432202339,0.26274511218071);
 		case 110: return Color3(0.26274511218071,0.32941177487373,0.57647061347961);
 		case 111: return Color3(0.74901962280273,0.71764707565308,0.69411766529083);
 		case 112: return Color3(0.4078431725502,0.45490199327469,0.6745098233223);
 		case 113: return Color3(0.89411771297455,0.678431391716,0.78431379795074);
 		case 115: return Color3(0.78039222955704,0.82352948188782,0.23529413342476);
 		case 116: return Color3(0.33333334326744,0.64705884456635,0.68627452850342);
 		case 118: return Color3(0.71764707565308,0.84313732385635,0.83529418706894);
 		case 119: return Color3(0.64313727617264,0.74117648601532,0.27843138575554);
 		case 120: return Color3(0.85098046064377,0.89411771297455,0.65490198135376);
 		case 121: return Color3(0.90588241815567,0.6745098233223,0.34509804844856);
 		case 123: return Color3(0.82745105028152,0.43529415130615,0.29803922772408);
 		case 124: return Color3(0.57254904508591,0.22352942824364,0.47058826684952);
 		case 125: return Color3(0.91764712333679,0.72156864404678,0.57254904508591);
 		case 126: return Color3(0.64705884456635,0.64705884456635,0.79607850313187);
 		case 127: return Color3(0.86274516582489,0.73725491762161,0.50588238239288);
 		case 128: return Color3(0.68235296010971,0.47843140363693,0.34901961684227);
 		case 131: return Color3(0.61176472902298,0.63921570777893,0.65882354974747);
 		case 133: return Color3(0.83529418706894,0.45098042488098,0.23921570181847);
 		case 134: return Color3(0.84705889225006,0.8666667342186,0.33725491166115);
 		case 135: return Color3(0.45490199327469,0.52549022436142,0.61568629741669);
 		case 136: return Color3(0.52941179275513,0.48627454042435,0.56470590829849);
 		case 137: return Color3(0.87843143939972,0.59607845544815,0.39215689897537);
 		case 138: return Color3(0.58431375026703,0.54117649793625,0.45098042488098);
 		case 140: return Color3(0.12549020349979,0.22745099663734,0.33725491166115);
 		case 141: return Color3(0.15294118225574,0.27450981736183,0.17647059261799);
 		case 143: return Color3(0.8117647767067,0.88627457618713,0.96862751245499);
 		case 145: return Color3(0.47450983524323,0.53333336114883,0.63137257099152);
 		case 146: return Color3(0.58431375026703,0.55686277151108,0.63921570777893);
 		case 147: return Color3(0.57647061347961,0.52941179275513,0.40392160415649);
 		case 148: return Color3(0.34117648005486,0.34509804844856,0.34117648005486);
 		case 149: return Color3(0.086274512112141,0.11372549831867,0.19607844948769);
 		case 150: return Color3(0.67058825492859,0.678431391716,0.6745098233223);
 		case 151: return Color3(0.47058826684952,0.56470590829849,0.50980395078659);
 		case 153: return Color3(0.58431375026703,0.47450983524323,0.46666669845581);
 		case 154: return Color3(0.48235297203064,0.1803921610117,0.1843137294054);
 		case 157: return Color3(1,0.96470594406128,0.48235297203064);
 		case 158: return Color3(0.88235300779343,0.64313727617264,0.7607843875885);
 		case 168: return Color3(0.4588235616684,0.42352944612503,0.38431376218796);
 		case 176: return Color3(0.59215688705444,0.41176474094391,0.35686275362968);
 		case 178: return Color3(0.70588237047195,0.51764708757401,0.33333334326744);
 		case 179: return Color3(0.53725492954254,0.52941179275513,0.53333336114883);
 		case 180: return Color3(0.84313732385635,0.66274511814117,0.29411765933037);
 		case 190: return Color3(0.9764706492424,0.83921575546265,0.1803921610117);
 		case 191: return Color3(0.90980398654938,0.67058825492859,0.17647059261799);
 		case 192: return Color3(0.41176474094391,0.25098040699959,0.15686275064945);
 		case 193: return Color3(0.8117647767067,0.37647062540054,0.14117647707462);
 		case 195: return Color3(0.27450981736183,0.40392160415649,0.64313727617264);
 		case 196: return Color3(0.13725490868092,0.27843138575554,0.54509806632996);
 		case 198: return Color3(0.55686277151108,0.258823543787,0.52156865596771);
 		case 199: return Color3(0.38823533058167,0.37254902720451,0.38431376218796);
 		case 200: return Color3(0.50980395078659,0.54117649793625,0.3647058904171);
 		case 208: return Color3(0.89803928136826,0.89411771297455,0.87450987100601);
 		case 209: return Color3(0.69019609689713,0.55686277151108,0.26666668057442);
 		case 210: return Color3(0.43921571969986,0.58431375026703,0.47058826684952);
 		case 211: return Color3(0.47450983524323,0.70980393886566,0.70980393886566);
 		case 212: return Color3(0.6235294342041,0.76470595598221,0.91372555494308);
 		case 213: return Color3(0.42352944612503,0.50588238239288,0.71764707565308);
 		case 216: return Color3(0.56078433990479,0.29803922772408,0.16470588743687);
 		case 217: return Color3(0.48627454042435,0.36078432202339,0.27450981736183);
 		case 218: return Color3(0.58823531866074,0.43921571969986,0.6235294342041);
 		case 219: return Color3(0.41960787773132,0.38431376218796,0.60784316062927);
 		case 220: return Color3(0.65490198135376,0.66274511814117,0.80784320831299);
 		case 221: return Color3(0.80392163991928,0.38431376218796,0.59607845544815);
 		case 222: return Color3(0.89411771297455,0.678431391716,0.78431379795074);
 		case 223: return Color3(0.86274516582489,0.56470590829849,0.58431375026703);
 		case 224: return Color3(0.94117653369904,0.83529418706894,0.62745100259781);
 		case 225: return Color3(0.9215686917305,0.72156864404678,0.49803924560547);
 		case 226: return Color3(0.99215692281723,0.91764712333679,0.55294120311737);
 		case 232: return Color3(0.49019610881805,0.73333334922791,0.8666667342186);
 		case 268: return Color3(0.2039215862751,0.16862745583057,0.4588235616684);
 		case 1001: return Color3(0.97254908084869,0.97254908084869,0.97254908084869);
 		case 1002: return Color3(0.80392163991928,0.80392163991928,0.80392163991928);
 		case 1003: return Color3(0.066666670143604,0.066666670143604,0.066666670143604);
 		case 1004: return Color3(1,0,0);
 		case 1005: return Color3(1,0.68627452850342,0);
 		case 1006: return Color3(0.70588237047195,0.50196081399918,1);
 		case 1007: return Color3(0.63921570777893,0.29411765933037,0.29411765933037);
 		case 1008: return Color3(0.75686281919479,0.74509805440903,0.258823543787);
 		case 1009: return Color3(1,1,0);
 		case 1010: return Color3(0,0,1);
 		case 1011: return Color3(0,0.12549020349979,0.37647062540054);
 		case 1012: return Color3(0.1294117718935,0.32941177487373,0.72549021244049);
 		case 1013: return Color3(0.015686275437474,0.68627452850342,0.92549026012421);
 		case 1014: return Color3(0.66666668653488,0.33333334326744,0);
 		case 1015: return Color3(0.66666668653488,0,0.66666668653488);
 		case 1016: return Color3(1,0.40000003576279,0.80000007152557);
 		case 1017: return Color3(1,0.68627452850342,0);
 		case 1018: return Color3(0.070588238537312,0.93333339691162,0.83137261867523);
 		case 1019: return Color3(0,1,1);
 		case 1020: return Color3(0,1,0);
 		case 1021: return Color3(0.22745099663734,0.49019610881805,0.082352943718433);
 		case 1022: return Color3(0.49803924560547,0.55686277151108,0.39215689897537);
 		case 1023: return Color3(0.54901963472366,0.35686275362968,0.6235294342041);
 		case 1024: return Color3(0.68627452850342,0.8666667342186,1);
 		case 1025: return Color3(1,0.78823536634445,0.78823536634445);
 		case 1026: return Color3(0.69411766529083,0.65490198135376,1);
 		case 1027: return Color3(0.6235294342041,0.95294123888016,0.91372555494308);
 		case 1028: return Color3(0.80000007152557,1,0.80000007152557);
 		case 1029: return Color3(1,1,0.80000007152557);
 		case 1030: return Color3(1,0.80000007152557,0.60000002384186);
 		case 1031: return Color3(0.38431376218796,0.14509804546833,0.81960791349411);
 		case 1032: return Color3(1,0,0.74901962280273);
 		default: return Color3::gray();
 	}
 }
 bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 {
 	xml_node<> * watchFirstNode = scanNode->first_node();
 	for (xml_node<> *node = scanNode->first_node();node; node = node->next_sibling())
 	{
 		if (strncmp(node->name(),"Item",4)==0)
 		{
 			xml_attribute<> *classAttr = node->first_attribute("class");
 			std::string className = classAttr->value();
 			if (className=="Part") {
 				xml_node<> *propNode = node->first_node();
 				xml_node<> *cFrameNode=0;
 				xml_node<> *sizeNode=0;
 				xml_node<> *colorNode=0;
 				xml_node<> *brickColorNode=0;
 				xml_node<> *nameNode=0;
 				for (xml_node<> *partPropNode = propNode->first_node();partPropNode; partPropNode = partPropNode->next_sibling())
 				{
 					for (xml_attribute<> *attr = partPropNode->first_attribute();attr; attr = attr->next_attribute())
 					{
 						std::string xmlName = attr->name();
 						std::string xmlValue = attr->value();
 						if (xmlValue=="CFrame" | xmlValue=="CoordinateFrame")
 						{
 							 cFrameNode = partPropNode;
 						}
 						if (xmlValue=="Name")
 						{
 							 nameNode = partPropNode;
 						}
 						if (xmlValue=="Color")
 						{
 							colorNode=partPropNode;
 						}
 						if (xmlValue=="BrickColor")
 						{
 							brickColorNode=partPropNode;
 						}
 						if (xmlValue=="size")
 						{
 							sizeNode = partPropNode;
 							_legacyLoad=false;
 						}
 						if (xmlValue=="Part")
 						{
 							for (xml_node<> *featureNode = partPropNode->first_node();featureNode; featureNode = featureNode->next_sibling())
 							{
 								for (xml_attribute<> *attr = featureNode->first_attribute();attr; attr = attr->next_attribute())
 								{
 									std::string xmlName = attr->name();
 									std::string xmlValue = attr->value();
 									if (xmlValue=="size")
 									{
 										sizeNode=featureNode;
 										_legacyLoad=true;
 									}
 								}
 							}
 						}
 					}
 				}
 				if (!cFrameNode) {
 					_errMsg="CFrame is missing in Part";
 					return false;
 				}
 				if (!sizeNode) {
 					_errMsg="Size is missing in Part";
 					return false;
 				}
 				float R=1;
 				float G=1;
 				float B=1;
 				if (colorNode)
 				{
 					R = getFloatValue(colorNode,"R");
 					G = getFloatValue(colorNode,"G");
 					B = getFloatValue(colorNode,"B");
 				}
 				std::string newName = nameNode->value();
 				float X = getFloatValue(cFrameNode,"X");
 				float Y = getFloatValue(cFrameNode,"Y");
 				float Z = getFloatValue(cFrameNode,"Z");
 				float R00 = getFloatValue(cFrameNode,"R00");
 				float R01 = getFloatValue(cFrameNode,"R01");
 				float R02 = getFloatValue(cFrameNode,"R02");
 				float R10 = getFloatValue(cFrameNode,"R10");
 				float R11 = getFloatValue(cFrameNode,"R11");
 				float R12 = getFloatValue(cFrameNode,"R12");
 				float R20 = getFloatValue(cFrameNode,"R20");
 				float R21 = getFloatValue(cFrameNode,"R21");
 				float R22 = getFloatValue(cFrameNode,"R22");
 				float sizeX = getFloatValue(sizeNode,"X");
 				float sizeY = getFloatValue(sizeNode,"Y");
 				float sizeZ = getFloatValue(sizeNode,"Z");
 				//sizeX=1;
 				//sizeY=1;
 				//sizeZ=1;
 				if (_successfulLoad) {
 					PartInstance* test = makePart();
 					test->setParent(getWorkspace());
 					test->color = Color3(R,G,B);
 					if(brickColorNode)
 					{
 						test->color = bcToRGB(atoi(brickColorNode->value()));
 					}
 					test->setSize(Vector3(sizeX,sizeY+_modY,sizeZ));
 					test->setName(newName);
 					CoordinateFrame cf;
 					if (_legacyLoad)
 					{
 						cf = CoordinateFrame(Vector3(-X,Y,Z))*CoordinateFrame(Vector3(-sizeX/2,(sizeY+_modY)/2,sizeZ/2)*Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22));
 						cf.rotation = Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22);
 					}
 					else
 					{
 						cf.translation = Vector3(X,Y,Z);
 						cf.rotation = Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22);
 					}
 					test->setCFrame(cf);
 				}
 				else
 				{
 					return false;
 				}
 			}
 		}
 		/*
 		for (xml_attribute<> *attr = node->first_attribute();attr; attr = attr->next_attribute())
 		{
 			std::string xmlName = attr->name();
 			std::string xmlValue = attr->value();
 		}
 		*/
 		scanXMLObject(node);
 	}
 	return true;
 }
 bool DataModelInstance::load(const char* filename, bool clearObjects)
 {
 	ifstream levelFile(filename,ios::binary);
 	if (levelFile)
 	{
 		if (clearObjects)
 			clearLevel();
 		readXMLFileStream(&levelFile);
 		std::string sfilename = std::string(filename);
 		std::size_t begin = sfilename.rfind('\\') + 1;
 		std::size_t end = sfilename.find(".rbx");
 		std::string hname = sfilename.substr(begin);
 		std::string tname = hname.substr(0, hname.length() - 5);
 		name = tname;
 		return true;
 	}
 }
 bool DataModelInstance::readXMLFileStream(std::ifstream* file)
 {
 	file->seekg(0,file->end);
 	int length = file->tellg();
 	file->seekg(0,file->beg);
 	char * buffer = new char[length+1];
 	buffer[length]=0;
 	file->read(buffer,length);
 	file->close();
 	xml_document<> doc;
 	doc.parse<0>(buffer);
 	xml_node<> *mainNode = doc.first_node();
 	_legacyLoad=false;
 	//std::string xmlName = mainNode->name();
 	//node = node->first_node();
 	//xmlName = node->name();
 	scanXMLObject(mainNode);
 	delete[] buffer;
 	return true;
 }
 bool DataModelInstance::debugGetOpen()
 {
 	ifstream levelFile(_loadedFileName.c_str(),ios::binary);
 	if (levelFile)
 		readXMLFileStream(&levelFile);
 	else
 		getOpen();
 	return true;
 }
 bool DataModelInstance::getOpen()
 {
 	_modY=0;
 	OPENFILENAME of;
 	ZeroMemory( &of , sizeof( of));
 	of.lStructSize = sizeof(OPENFILENAME);
 	of.lpstrFilter = "Roblox Files\0*.rbxm;*.rbxl\0\0";
 	char szFile[512];
 	of.lpstrFile = szFile ;
 	of.lpstrFile[0]='\0';
 	of.nMaxFile=500;
 	of.lpstrTitle="Hello";
 	of.Flags = OFN_FILEMUSTEXIST;
 	ShowCursor(TRUE);
 	BOOL file = GetOpenFileName(&of);
 	if (file)
 	{
 		_loadedFileName = of.lpstrFile;
 		load(of.lpstrFile,true);
 	}
 	return true;
 }
 void DataModelInstance::setMessage(std::string msg)
 {
 	message = msg;
 	isBrickCount = false;
 	showMessage = true;
 }
 void DataModelInstance::clearMessage()
 {
 	showMessage = false;
 	isBrickCount = false;
 	message = "";
 }
 void DataModelInstance::setMessageBrickCount()
 {
 	isBrickCount = true;
 	showMessage = true;
 }
 void DataModelInstance::drawMessage(RenderDevice* rd)
 {
 	if(isBrickCount)
 	{
 		int brickCount = 0;
 		int instCount = 0;
 		std::vector<Instance*> inst = getAllChildren();
 		for(size_t i = 0; i < inst.size(); i++)
 		{
 			if(PartInstance* moveTo = dynamic_cast<PartInstance*>(inst.at(i)))
 			{
 				brickCount++;
 			}
 			else
 			{
 				instCount++;
 			}
 		}
 		char brkc[12];
 		sprintf(brkc, "%d", brickCount);
 		char instc[12];
 		sprintf(instc, "%d", instCount);
 		message = "Bricks: ";
 		message += brkc;
 		message += "	Snaps: ";
 		message += instc;
 	}
 	if(showMessage && !font.isNull())
 	{
 		int x = rd->getWidth()/2;
 		int y = rd->getHeight()/2;
 		int width = rd->getWidth()/2 + 100;
 		int height = width / 3;
 		Draw::box(Box(Vector3(x-(width/2), y-(height/2), 0), Vector3(x+(width/2), y+(height/2), 0)), rd, Color4::fromARGB(0x55B2B2B2), Color3::fromARGB(0xB2B2B2));
 		font->draw2D(rd, message, Vector2(x,y), height/8, Color3::white(), Color4::clear(), GFont::XALIGN_CENTER, GFont::YALIGN_CENTER);
 	}
 }
 WorkspaceInstance* DataModelInstance::getWorkspace()
 {
 	return workspace;
 }
 Vector2 DataModelInstance::getMousePos()
 {
 	return Vector2(mousex,mousey);
 }
 void DataModelInstance::setMousePos(int x,int y)
 {
 	mousex=x;
 	mousey=y;
 }
 void DataModelInstance::setMousePos(Vector2 pos)
 {
 	mousex=pos.x;
 	mousey=pos.y;
 }
 Instance* DataModelInstance::getGuiRoot()
 {
 	return guiRoot;
 }
 LevelInstance* DataModelInstance::getLevel()
 {
 	return level;
 }
--- a/src/include/DataModelV2/DataModelInstance.h
+++ b/src/include/DataModelV2/DataModelInstance.h
@@ -3,10 +3,6 @@
 #include "LevelInstance.h"
 #include "PartInstance.h"
 #include "rapidxml/rapidxml.hpp"
 #include "GuiRootInstance.h"
 #include "XplicitNgine/XplicitNgine.h"
 class GuiRootInstance;
 class DataModelInstance :
 	public Instance
@@ -23,24 +19,23 @@ public:
 	bool					readXMLFileStream(std::ifstream* file);
 	void					drawMessage(RenderDevice*);
 	WorkspaceInstance*		getWorkspace();
 	WorkspaceInstance*		workspace;
 	LevelInstance *			level;
 	LevelInstance *			getLevel();
-	XplicitNgine *			getEngine();
+	Instance*				guiRoot;
 	std::string				message;
 	std::string				_loadedFileName;
 	bool					showMessage;
 	G3D::GFontRef			font;
-	GuiRootInstance*		getGuiRoot();
+	Instance*				getGuiRoot();
-	//float					mousex;
+	float					mousex;
-	//float					mousey;
+	float					mousey;
-	//Vector2					getMousePos();
+	Vector2					getMousePos();
-	//void					setMousePos(int x,int y);
+	void					setMousePos(int x,int y);
-	//void					setMousePos(Vector2 pos);
+	void					setMousePos(Vector2 pos);
-	//bool					mouseButton1Down;
+	bool					mouseButton1Down;
 	PartInstance*			makePart();
 	void					clearLevel();
 	void					toggleRun();
 	bool					isRunning();
 	void					resetEngine();
 #if _DEBUG
 	void					modXMLLevel(float modY);
 #endif
@@ -53,9 +48,4 @@ private:
 	std::string				_errMsg;
 	bool					_legacyLoad;
 	float					_modY;
 	WorkspaceInstance*		workspace;
 	LevelInstance *			level;
 	GuiRootInstance*		guiRoot;
 	bool					running;
 	XplicitNgine *			xplicitNgine;
 };
--- a/src/include/Application.h
+++ b/src/include/Application.h
@@ -1,24 +1,13 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
 #include "DataModelV2/TextButtonInstance.h"
 #include "DataModelV2/ImageButtonInstance.h"
 #include "CameraController.h"
-#include "IEBrowser.h"
+#include "PropertyWindow.h"
 #include "Mouse.h"
 #include "Tool/Tool.h"
 //#include "GuiRoot.h"
-class TextButtonInstance;
+class Demo { // : public GApp {
 class ImageButtonInstance;
 class PartInstance;
 class CameraController;
 class Application { // : public GApp {
 	public:
-		Application(HWND parentWindow);
+		Demo(const GAppSettings& settings,HWND parentWindow);
 		void Boop();
-		virtual			~Application() {}
+		virtual			~Demo() {}
 		virtual void	exitApplication();
 		virtual void	onInit();
 		virtual void	onLogic();
@@ -27,13 +16,8 @@ class Application { // : public GApp {
 		virtual void	onGraphics(RenderDevice* rd);
 		virtual void	onUserInput(UserInput* ui);
 		virtual void	onCleanup();
-		void			clearInstances();
+
 		void			navigateToolbox(std::string);
 		PartInstance*	makePart();
 		void			drawButtons(RenderDevice* rd);
 		void			drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
 		std::vector<Instance*>	getSelection();
 		void		deleteInstance();
 		void		run();
 		void		QuitApp();
 		void		resizeWithParent(HWND parentWindow);
@@ -41,29 +25,19 @@ class Application { // : public GApp {
 		void		onKeyPressed(int key);
 		void		onKeyUp(int key);
 		void		onMouseLeftPressed(HWND hwnd,int x, int y);
-		void		onMouseLeftUp(RenderDevice* renderDevice, int x, int y);
+		void		onMouseLeftUp(int x, int y);
 		void		onMouseRightPressed(int x, int y);
 		void		onMouseRightUp(int x, int y);
 		void		onMouseMoved(int x, int y);
 		void		onMouseWheel(int x, int y, short delta);
-		void		setFocus(bool isFocused);
+
 		int			getMode();
 		void		unSetMode();
 		CameraController	cameraController;
 		RenderDevice*		renderDevice;
 		UserInput*			userInput;
 		PropertyWindow*		_propWindow;
 		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
 		RenderDevice*		getRenderDevice();
 		void				selectInstance(Instance* selectedInstance,PropertyWindow* propWindow);
 		void				setMode(int mode);
 		Tool * tool;
 		void changeTool(Tool *);
 		Mouse mouse;
 	private:
-		bool				mouseMoveState;
+		void				initGUI();
 		RenderDevice*		renderDevice;
 		//void				initGUI();
 		HWND				_hWndMain;
 		SkyRef				sky;
 		bool				quit;
@@ -74,14 +48,8 @@ class Application { // : public GApp {
 		HWND				_hwndToolbox;
 		HWND				_buttonTest;
 		HWND				_hwndRenderer;
 		DataModelInstance*	_dataModel;
 		G3D::TextureRef		shadowMap;
 		std::string			_title;
 		bool				_dragging;
 		int					_mode;
 		GAppSettings		_settings;
 		double lightProjX, lightProjY, lightProjNear, lightProjFar;
 		IEBrowser*		webBrowser;
 	protected:
 		Stopwatch           m_graphicsWatch;
 		Stopwatch           m_logicWatch;
--- a/Dialogs.aps
+++ b/Dialogs.aps
--- a/Dialogs.rc
+++ b/Dialogs.rc
@@ -1,43 +1,91 @@
-// Generated by ResEdit 1.6.6
+// Microsoft Visual C++ generated resource script.
-// Copyright (C) 2006-2015
+//
-// http://www.resedit.net
+#include "resource.h"
-
+
-#include <windows.h>
+#define APSTUDIO_READONLY_SYMBOLS
-#include <commctrl.h>
+/////////////////////////////////////////////////////////////////////////////
-#include <richedit.h>
+//
-#include "src/include/resource.h"
+// Generated from the TEXTINCLUDE 2 resource.
-
+//
-
+#include "windows.h"
-
+
-
+/////////////////////////////////////////////////////////////////////////////
-//
+#undef APSTUDIO_READONLY_SYMBOLS
-// Bitmap resources
+
-//
+/////////////////////////////////////////////////////////////////////////////
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+// English (U.S.) resources
-IDB_BITMAP1        BITMAP         "Parts.bmp"
+
-
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-
+#ifdef _WIN32
-
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-//
+#pragma code_page(1252)
-// Dialog resources
+#endif //_WIN32
-//
+
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#ifdef APSTUDIO_INVOKED
-IDD_DIALOG1 DIALOG 0, 0, 295, 43
+/////////////////////////////////////////////////////////////////////////////
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFOREGROUND | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
+//
-EXSTYLE WS_EX_WINDOWEDGE
+// TEXTINCLUDE
-CAPTION "Insert Object"
+//
-FONT 8, "Ms Shell Dlg"
+
-{
+1 TEXTINCLUDE 
-    EDITTEXT        IDC_EDIT1, 35, 6, 195, 14, ES_AUTOHSCROLL, WS_EX_LEFT
+BEGIN
-    LTEXT           "Class:", 0, 10, 9, 20, 9, SS_LEFT, WS_EX_LEFT
+    "resource.h\0"
-    PUSHBUTTON      "Cancel", IDCANCEL, 237, 24, 50, 14, 0, WS_EX_LEFT
+END
-    DEFPUSHBUTTON   "OK", IDOK, 237, 6, 50, 14, 0, WS_EX_LEFT
+
-}
+2 TEXTINCLUDE 
-
+BEGIN
-
+    "#include ""windows.h""\r\n"
-
+    "\0"
-//
+END
-// Icon resources
+
-//
+3 TEXTINCLUDE 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+BEGIN
-IDI_ICON1          ICON           "FatB3dIcon.ico"
+    "\r\n"
    "\0"
 END
 #endif    // APSTUDIO_INVOKED
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // English (Canada) resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
 #ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
 #pragma code_page(1252)
 #endif //_WIN32
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_ICON1               ICON                    "icon1.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 IDB_BITMAP1             BITMAP                  "Parts.bmp"
 #endif    // English (Canada) resources
 /////////////////////////////////////////////////////////////////////////////
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
--- a/Documentation/index.html
+++ b/Documentation/index.html
@@ -1,13 +0,0 @@
 <html>
  <head>
    <title> RBX05R Documentation </title>
    <meta charset="utf-8">
  </head>
  <body>
    <div class="content" style="text-align:center;">
      <h1> ROBLOX 2005 Recreation documentation </h1>
      <br>
      <h4> Current for: r360 </h4> 
    </div>
  </body>
  </html>
--- a/Enum.h
+++ b/Enum.h
@@ -0,0 +1,17 @@
 #pragma once
 namespace Enum
 {
 	namespace SurfaceType
 	{
 		enum Value {
 			Smooth, Bumps, Welds, Glue
 		};
 	}
 	namespace Shape
 	{
 		enum Value {
 			Block, Sphere, Cylinder
 		};
 	}
 }
--- a/Enums.h
+++ b/Enums.h
@@ -0,0 +1,14 @@
 #ifndef ENUM_H
 #define ENUM_H
 static enum BinType {GameTool, Grab, Clone, Hammer};
 static enum ControllerType {None, KeyboardRight, KeyboardLeft, Joypad1, Joypad2, Chase, Flee};
 //static enum JointType {UNK0, WeldJoint, SnapJoint, UNK3, Rotate, RotateP, RotateV, GlueJoint, UNK8, UNK9, None};
 static enum ActionType {Nothing, Pause, Lose, Draw, Win};
 static enum AffectType {NoChange, Increase, Decrease};
 static enum InputType {NoInput, LeftTread, RightTread, Steer, Throtle, UpDown, Action1, Action2, Action3, Action4, Action5, Constant, Sin};
 //static enum SurfaceConstraint {None, Hinge, SteppingMotor, Motor};
 static enum SurfaceType{Smooth, Snaps, Inlets, Glue, Weld, Spawn, Hinge, Motor, Bumps};
 static enum SoundType {NoSound, Boing, Bomb, Break, Click, Clock, Slingshot, Page, Ping, Snap, Splat, Step, StepOn, Swoosh, Victory};
 static enum PartType {Ball, Block, Cylinder};
 static enum KeywordFilterType {Include, Exclude};
 #endif
--- a/FatB3dIcon.ico
+++ b/FatB3dIcon.ico
--- a/G3DTest.aps
+++ b/G3DTest.aps
--- a/Blocks3D.dsp
+++ b/Blocks3D.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="G3DTest" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 # TARGTYPE "Win32 (x86) Application" 0x0101
-CFG=Blocks3D - Win32 Debug
+CFG=G3DTest - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak".
+!MESSAGE NMAKE /f "G3DTest.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
+!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Blocks3D - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "G3DTest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "Blocks3D - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+!IF  "$(CFG)" == "G3DTest - Win32 Release"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
+!ELSEIF  "$(CFG)" == "G3DTest - Win32 Debug"
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -83,8 +83,8 @@ LINK32=link.exe
 # Begin Target
-# Name "Blocks3D - Win32 Release"
+# Name "G3DTest - Win32 Release"
-# Name "Blocks3D - Win32 Debug"
+# Name "G3DTest - Win32 Debug"
 # Begin Group "Source Files"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
--- a/Blocks3D.dsw
+++ b/Blocks3D.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 ###############################################################################
-Project: "Blocks3D"=.\Blocks3D.dsp - Package Owner=<4>
+Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4>
 Package=<5>
 {{{
--- a/G3DTest.opt
+++ b/G3DTest.opt
--- a/G3DTest.plg
+++ b/G3DTest.plg
@@ -0,0 +1,32 @@
 <html>
 <body>
 <pre>
 <h1>Build Log</h1>
 <h3>
 --------------------Configuration: G3DTest - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
 Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" with contents
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/G3DTest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\USERS\ANDREJA\G3D\G3DTest\main.cpp"
 ]
 Creating command line "cl.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" 
 Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/G3DTest.pdb" /debug /machine:I386 /out:"Debug/G3DTest.exe" /pdbtype:sept 
 .\Debug\main.obj
 ]
 Creating command line "link.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp"
 <h3>Output Window</h3>
 Compiling...
 main.cpp
 Linking...
 <h3>Results</h3>
 G3DTest.exe - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>
--- a/Blocks3D.sln
+++ b/Blocks3D.sln
@@ -1,7 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3DTest", "G3DTest.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -0,0 +1,499 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="G3DTest"
 	ProjectGUID="{277D185B-AEBA-4F75-A7FC-F1EBE787C200}"
 	RootNamespace="G3DTest"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
 				TypeLibraryName=".\Release/G3DTest.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/G3DTest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="4105"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib"
 				OutputFile="./G3DTest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/G3DTest.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
 				OutputFile=".\Release/G3DTest.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			ManagedExtensions="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
 				TypeLibraryName=".\Debug/G3DTest.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="false"
 				PrecompiledHeaderFile=".\Debug/G3DTest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="4105"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib"
 				OutputFile="./G3DTest-Debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/G3DTest.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
 				OutputFile=".\Debug/G3DTest.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 		<AssemblyReference
 			RelativePath="System.dll"
 			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.Data.dll"
 			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
 		/>
 		<AssemblyReference
 			RelativePath="System.Drawing.dll"
 			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.Windows.Forms.dll"
 			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 		<AssemblyReference
 			RelativePath="System.XML.dll"
 			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
 		/>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath=".\AudioPlayer.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\ax.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\BrowserCallHandler.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\ButtonListener.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\CameraController.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\Globals.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\GroupInstance.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\IEBrowser.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\IEBrowser.h"
 				>
 			</File>
 			<File
 				RelativePath=".\IEDispatcher.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\LevelInstance.cpp"
 				>
 			</File>
 			<File
 				RelativePath="main.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\PartInstance.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\propertyGrid.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\PropertyWindow.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\PVInstance.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\WindowFunctions.cpp"
 				>
 			</File>
 			<Filter
 				Name="Instance"
 				>
 				<File
 					RelativePath=".\BaseButtonInstance.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\DataModelInstance.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\ImageButtonInstance.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\Instance.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\TextButtonInstance.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\WorkspaceInstance.cpp"
 					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
 				RelativePath=".\AudioPlayer.h"
 				>
 			</File>
 			<File
 				RelativePath=".\ax.h"
 				>
 			</File>
 			<File
 				RelativePath=".\BrowserCallHandler.h"
 				>
 			</File>
 			<File
 				RelativePath=".\ButtonListener.h"
 				>
 			</File>
 			<File
 				RelativePath=".\CameraController.h"
 				>
 			</File>
 			<File
 				RelativePath=".\Demo.h"
 				>
 			</File>
 			<File
 				RelativePath=".\Enum.h"
 				>
 			</File>
 			<File
 				RelativePath=".\Enums.h"
 				>
 			</File>
 			<File
 				RelativePath=".\Globals.h"
 				>
 			</File>
 			<File
 				RelativePath=".\GroupInstance.h"
 				>
 			</File>
 			<File
 				RelativePath=".\IEDispatcher.h"
 				>
 			</File>
 			<File
 				RelativePath=".\LevelInstance.h"
 				>
 			</File>
 			<File
 				RelativePath=".\PartInstance.h"
 				>
 			</File>
 			<File
 				RelativePath=".\propertyGrid.h"
 				>
 			</File>
 			<File
 				RelativePath=".\PropertyWindow.h"
 				>
 			</File>
 			<File
 				RelativePath=".\PVInstance.h"
 				>
 			</File>
 			<File
 				RelativePath=".\rapidxml\rapidxml.hpp"
 				>
 			</File>
 			<File
 				RelativePath=".\rapidxml\rapidxml_iterators.hpp"
 				>
 			</File>
 			<File
 				RelativePath=".\rapidxml\rapidxml_print.hpp"
 				>
 			</File>
 			<File
 				RelativePath=".\rapidxml\rapidxml_utils.hpp"
 				>
 			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
 			</File>
 			<File
 				RelativePath=".\win32Defines.h"
 				>
 			</File>
 			<File
 				RelativePath=".\WindowFunctions.h"
 				>
 			</File>
 			<Filter
 				Name="Instance"
 				>
 				<File
 					RelativePath=".\BaseButtonInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\DataModelInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\ImageButtonInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\Instance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\TextButtonInstance.h"
 					>
 				</File>
 				<File
 					RelativePath=".\WorkspaceInstance.h"
 					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>
 			</File>
 			<File
 				RelativePath=".\icon1.ico"
 				>
 			</File>
 			<File
 				RelativePath=".\Parts.bmp"
 				>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 		<Global
 			Name="RESOURCE_FILE"
 			Value="Dialogs.rc"
 		/>
 	</Globals>
 </VisualStudioProject>
--- a/Globals.cpp
+++ b/Globals.cpp
@@ -0,0 +1,19 @@
 #include "Globals.h"
 DataModelInstance* Globals::dataModel = NULL;
 int const Globals::gen = 0;
 int const Globals::major = 0;
 int const Globals::minor = 4;
 int const Globals::patch = 2;
 int Globals::surfaceId = 2;
 bool Globals::showMouse = true;
 bool Globals::useMousePoint = false;
 std::vector<Instance*> postRenderStack = std::vector<Instance*>();
 const std::string Globals::PlaceholderName = "Dynamica";
 std::vector<Instance*> g_selectedInstances = std::vector<Instance*>();
 bool running = false;
 G3D::TextureRef Globals::surface;
 POINT Globals::mousepoint;
 Globals::Globals(void){}
 Globals::~Globals(void){}
--- a/Globals.h
+++ b/Globals.h
@@ -0,0 +1,25 @@
 #pragma once
 #include "DataModelInstance.h"
 #include <G3DAll.h>
 class Globals
 {
 public:
    Globals(void);
    ~Globals(void);
    static DataModelInstance* dataModel;
 	static bool showMouse;
 	static POINT mousepoint;
 	static bool useMousePoint;
 	static const int gen;
 	static const int major;
 	static const int minor;
 	static const int patch;
 	static G3D::TextureRef surface;
 	static int surfaceId;
 	static const std::string PlaceholderName;
 };
 extern std::vector<Instance*> postRenderStack;
 extern std::vector<Instance*> g_selectedInstances;
 extern bool running;
--- a/GroupInstance.cpp
+++ b/GroupInstance.cpp
@@ -0,0 +1,26 @@
 #include "GroupInstance.h"
 GroupInstance::GroupInstance(void)
 {
 	PVInstance::PVInstance();
 	className = "GroupInstance";
 }
 GroupInstance::GroupInstance(const GroupInstance &oinst)
 {
 	PVInstance::PVInstance(oinst);
 }
 GroupInstance::~GroupInstance(void)
 {
 }
 std::vector<PROPGRIDITEM> GroupInstance::getProperties()
 {
 	std::vector<PROPGRIDITEM> properties = PVInstance::getProperties();
 	return properties;
 }
 void GroupInstance::PropUpdate(LPPROPGRIDITEM &pItem)
 {
 	PVInstance::PropUpdate(pItem);
 }
--- a/src/include/DataModelV2/GroupInstance.h
+++ b/src/include/DataModelV2/GroupInstance.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "PartInstance.h"
+#include "PVInstance.h"
 class GroupInstance :
 	public PVInstance
@@ -10,7 +10,4 @@ public:
 	GroupInstance(const GroupInstance &oinst);
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
 	std::vector<Instance *> unGroup();
 	PartInstance * primaryPart;
 	void render(RenderDevice * r);
 };
--- a/IEBrowser.cpp
+++ b/IEBrowser.cpp
@@ -0,0 +1,68 @@
 #ifndef WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include "IEBrowser.h"
 #include "Globals.h"
 #include "ax.h"
 void IEBrowser::Boop(char* test)
 {
 }
 IEBrowser::IEBrowser(HWND attachHWnd) {
 	MSG messages;
 	while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
 	{
 		if (IsDialogMessage(hwnd, &messages) == 0)
 		{
 			TranslateMessage(&messages);
 			DispatchMessage(&messages);
 		}
 	}
 	hwnd = attachHWnd;
 	spDocument = 0;
 	webBrowser = 0;
 	SendMessage(hwnd,AX_INPLACE,1,0);
 	SendMessage(hwnd,AX_QUERYINTERFACE,(WPARAM)&IID_IWebBrowser2,(LPARAM)&webBrowser);
 }
 IEBrowser::~IEBrowser(void) {
 	if (webBrowser)
 	{
 		webBrowser->Release();
 	}
 }
 bool IEBrowser::navigateSyncURL(wchar_t* url)
 {
 	MSG messages;
 	if (webBrowser)
 	{
 		webBrowser->Navigate(url,0,0,0,0);
 		for (int i=1;i<1000;i++)
 		{
 			while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
 			{
 				if (IsDialogMessage(hwnd, &messages) == 0)
 				{
 					TranslateMessage(&messages);
 					DispatchMessage(&messages);
 				}
 			}
 			Sleep(30);
 			HRESULT hresult = webBrowser->get_Document(&spDocument);
 			if (&spDocument!=0)
 			{
 				return true;
 			}
 		}
 	}
 	else
 	{
 		MessageBox(NULL,"Cannot read IWebBrowser2...",(Globals::PlaceholderName+" Crash").c_str(),MB_OK);
 	}
 	return false;
 }
--- a/IEBrowser.h
+++ b/IEBrowser.h
@@ -0,0 +1,17 @@
 //#include "WindowFunctions.h"
 #pragma once
 #include <mshtml.h>
 #include <exdisp.h>
 //#include <Mshtmhst.h>
 class IEBrowser {
 	public:
 		IEBrowser(HWND attachHWnd);
 		~IEBrowser(void);
 		bool navigateSyncURL(wchar_t* url);
 		void Boop(char* test);
 	private:
 		IWebBrowser2* webBrowser;
 		HWND hwnd;
 		IDispatch* spDocument;
 };
--- a/src/source/IEDispatcher.cpp
+++ b/src/source/IEDispatcher.cpp
@@ -33,6 +33,7 @@ HRESULT STDMETHODCALLTYPE IEDispatcher::GetIDsOfNames(const IID &, LPOLESTR *, U
 	return NULL;
 }
 HRESULT STDMETHODCALLTYPE IEDispatcher::Invoke(DISPID, const IID &, LCID, WORD, DISPPARAMS *, VARIANT *, EXCEPINFO *, UINT *)
 {
 	return NULL;
 }
--- a/src/include/IEDispatcher.h
+++ b/src/include/IEDispatcher.h
@@ -1,18 +1,8 @@
 #pragma once
 #include "oaidl.h"
 //DEFINE_GUID(CLSID_G3d, 0xB323F8E0L, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6F);
 class IEDispatcher : public IDispatch
 {
 /*
 EXTERN_C const IID IID_IDispatch;
 #if defined(__cplusplus) && !defined(CINTERFACE)
    MIDL_INTERFACE("B323F8E0-2E68-11D0-90EA-00AA0060F86F")
    IEDispatcher : public IDispatch
 	{
 */
 public:
 	IEDispatcher(void);
 	~IEDispatcher(void);
@@ -25,5 +15,3 @@ public:
 	HRESULT STDMETHODCALLTYPE IEDispatcher::Invoke(DISPID, const IID &, LCID, WORD, DISPPARAMS *, VARIANT *, EXCEPINFO *, UINT *);
 };
 //#endif
--- a/src/source/DataModel/ImageButtonInstance.cpp
+++ b/src/source/DataModel/ImageButtonInstance.cpp
@@ -1,4 +1,4 @@
-#include "DataModel/ImageButtonInstance.h"
+#include "ImageButtonInstance.h"
 ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
 {
--- a/src/include/DataModelV2/ImageButtonInstance.h
+++ b/src/include/DataModelV2/ImageButtonInstance.h
@@ -1,8 +1,5 @@
 #pragma once
 #include "BaseButtonInstance.h"
 class BaseButtonInstance;
 class ImageButtonInstance : public BaseButtonInstance
 {
 public:
--- a/Installer/Redist/vcredist_x64.exe
+++ b/Installer/Redist/vcredist_x64.exe
--- a/Installer/Redist/vcredist_x86.exe
+++ b/Installer/Redist/vcredist_x86.exe
--- a/Installer/install_script.iss
+++ b/Installer/install_script.iss
@@ -1,47 +0,0 @@
 ;InnoSetupVersion=5.4.3
 [Setup]
 AppName=Blocks3D
 AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
 AppVersion=v0.0.105.0
 AppPublisherURL=http://blocks3d.com/
 AppSupportURL=http://blocks3d.com/
 AppUpdatesURL=http://blocks3d.com/
 DefaultDirName={%localappdata}\Blocks3D
 OutputBaseFilename=Blocks3D_Setup_{#SetupSetting("AppVersion")}
 Compression=lzma2
 PrivilegesRequired=lowest
 WizardImageFile=setup.bmp
 DefaultGroupName=Blocks3D
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}"
 [Files]
 Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
 Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
 Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
 Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 [Registry]
 [Run]
 Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
 Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
 Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
 [Icons]
 Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
 Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
 Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
 Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
 [Tasks]
 Name: "instvc"; Description: "Install Visual C++ Redistributable 2005 SP1 (Requires elevated permissions)";
 Name: "desktopicon"; Description: "Create Desktop Icons";
 Name: "startscut"; Description: "Create Start Menu Icons";
--- a/Installer/setup.bmp
+++ b/Installer/setup.bmp
--- a/Installer/setup.png
+++ b/Installer/setup.png
--- a/src/source/DataModelV2/Instance.cpp
+++ b/src/source/DataModelV2/Instance.cpp
@@ -1,7 +1,6 @@
 #define WINVER	0x0400
 #include <G3DAll.h>
-#include "DataModelV2/Instance.h"
+#include "Instance.h"
 Instance::Instance(void)
@@ -9,7 +8,7 @@ Instance::Instance(void)
 	parent = NULL;
 	name = "Default Game Instance";
 	className = "BaseInstance";
-	listicon = 1;
+	listicon = 0;
 	canDelete = true;
 }
@@ -19,7 +18,6 @@ Instance::Instance(const Instance &oinst)
 	name = oinst.name;
 	className = oinst.className;
 	canDelete = oinst.canDelete;
 	listicon = oinst.listicon;
 	//setParent(oinst.parent);
 }
@@ -27,17 +25,22 @@ Instance::Instance(const Instance &oinst)
 void Instance::render(RenderDevice* rd)
 {
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
 	glEnableClientState(GL_NORMAL_ARRAY);
 	for(size_t i = 0; i < children.size(); i++)
 	{
-		children[i]->render(rd);
+		children.at(i)->render(rd);
 	}
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
 	glDisableClientState(GL_NORMAL_ARRAY);
 }
 void Instance::update()
 {
 }
-PROPGRIDITEM Instance::createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[])
+
 PROPGRIDITEM Instance::createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type)
 {
 	PROPGRIDITEM pItem;
 	PropGrid_ItemInit(pItem);
@@ -46,8 +49,6 @@ PROPGRIDITEM Instance::createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc,
 	pItem.lpszPropDesc=propDesc;
 	pItem.lpCurValue=curVal;
 	pItem.iItemType=type;
 	if(choices != NULL)
 		pItem.lpszzCmbItems = choices;
 	return pItem;
 }
@@ -140,10 +141,6 @@ void Instance::addChild(Instance* newChild)
 void Instance::clearChildren()
 {
 	for (size_t i = 0; i < children.size(); i++)
 	{
 		delete children.at(i);
 	} 
 	children.clear();
 }
 void Instance::removeChild(Instance* oldChild)
--- a/src/include/DataModelV2/Instance.h
+++ b/src/include/DataModelV2/Instance.h
@@ -1,9 +1,7 @@
 #pragma once
 #include <G3DAll.h>
 #include "propertyGrid.h"
 #include "map"
 //#include "Properties/BoolProperty.h"
 class Instance
 {
 public:
@@ -13,13 +11,12 @@ public:
 	virtual ~Instance(void);
 	std::string name;
 	virtual void render(RenderDevice*);
 	virtual void update();
 	std::vector<Instance*> children; // All children.
 	std::string getClassName();
 	Instance* findFirstChild(std::string);
 	std::vector<Instance* > getChildren();
 	std::vector<Instance* > getAllChildren();
-	virtual void setParent(Instance*);
+	void setParent(Instance*);
 	void setName(std::string newName);
 	void addChild(Instance*);
 	void removeChild(Instance*);
@@ -32,7 +29,6 @@ public:
 protected:
 	std::string className;
 	Instance* parent;  // Another pointer.
-	PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[] = NULL);
+	PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type);
-private:
+	
 	static const std::map<std::string, Instance> g_logLevelsDescriptions;
 };
--- a/339
+++ b/339
@@ -1,339 +0,0 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
 the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 this service if you wish), that you receive source code or can get it
 if you want it, that you can change the software or use pieces of it
 in new free programs; and that you know you can do these things.
  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
 source code.  And you must show them these terms so they know their
 rights.
  We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
  Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.
                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
 means either the Program or any derivative work under copyright law:
 that is to say, a work containing the Program or a portion of it,
 either verbatim or with modifications and/or translated into another
 language.  (Hereinafter, translation is included without limitation in
 the term "modification".)  Each licensee is addressed as "you".
 Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
 running the Program is not restricted, and the output from the Program
 is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
  1. You may copy and distribute verbatim copies of the Program's
 source code as you receive it, in any medium, provided that you
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
 notices that refer to this License and to the absence of any warranty;
 and give any other recipients of the Program a copy of this License
 along with the Program.
 You may charge a fee for the physical act of transferring a copy, and
 you may at your option offer warranty protection in exchange for a fee.
  2. You may modify your copy or copies of the Program or any portion
 of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.
    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.
    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
 entire whole, and thus to each and every part regardless of who wrote it.
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Program.
 In addition, mere aggregation of another work not based on the Program
 with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
  3. You may copy and distribute the Program (or a work based on it,
 under Section 2) in object code or executable form under the terms of
 Sections 1 and 2 above provided that you also do one of the following:
    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,
    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,
    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
 code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
 anything that is normally distributed (in either source or binary
 form) with the major components (compiler, kernel, and so on) of the
 operating system on which the executable runs, unless that component
 itself accompanies the executable.
 If distribution of executable or object code is made by offering
 access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
 However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Program (or any work based on the
 Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Program at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
 If any portion of this section is held invalid or unenforceable under
 any particular circumstance, the balance of the section is intended to
 apply and the section as a whole is intended to apply in other
 circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
 those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 Each version is given a distinguishing version number.  If the Program
 specifies a version number of this License which applies to it and "any
 later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
 make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
                            NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, the commands you use may
 be called something other than `show w' and `show c'; they could even be
 mouse-clicks or menu items--whatever suits your program.
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.
  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/src/source/DataModel/LevelInstance.cpp
+++ b/src/source/DataModel/LevelInstance.cpp
@@ -1,4 +1,4 @@
-#include "DataModel/LevelInstance.h"
+#include "LevelInstance.h"
 LevelInstance::LevelInstance(void)
 {
@@ -36,8 +36,8 @@ std::vector<PROPGRIDITEM> LevelInstance::getProperties()
 		PIT_EDIT));
-	sprintf_s(timerTxt, "%g", timer);
+	sprintf(timerTxt, "%g", timer);
-	sprintf_s(scoreTxt, "%d", score);
+	sprintf(scoreTxt, "%d", score);
 	properties.push_back(createPGI("Gameplay",
 		"InitialTimerValue",
 		"The ammount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.",
--- a/src/include/DataModelV2/LevelInstance.h
+++ b/src/include/DataModelV2/LevelInstance.h
--- a/Manifest.xml
+++ b/Manifest.xml
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,6 +0,0 @@
 Open Dynamics Engine
 Copyright (c) 2001-2004,
 Russell L. Smith.
 All rights reserved.
--- a/PVInstance.cpp
+++ b/PVInstance.cpp
@@ -0,0 +1,41 @@
 #include "PVInstance.h"
 PVInstance::PVInstance(void)
 {
 	Instance::Instance();
 	nameShown = false;
 	className = "PVInstance";
 }
 PVInstance::PVInstance(const PVInstance &oinst)
 {
 	Instance::Instance(oinst);
 }
 PVInstance::~PVInstance(void)
 {
 }
 void PVInstance::postRender(RenderDevice* rd)
 {
 }
 std::vector<PROPGRIDITEM> PVInstance::getProperties()
 {
 	std::vector<PROPGRIDITEM> properties = Instance::getProperties();
 	properties.push_back(createPGI(
 		"Item",
 		"NameShown",
 		"This chooses whether the item name is shown",
 		nameShown,
 		PIT_CHECK));
 	return properties;
 }
 void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
 {
 	if(strcmp(pItem->lpszPropName, "NameShown") == 0)
 	{
 		nameShown = (bool)pItem->lpCurValue;
 	}
 	else Instance::PropUpdate(pItem);
 }
--- a/PVInstance.h
+++ b/PVInstance.h
@@ -0,0 +1,15 @@
 #pragma once
 #include "instance.h"
 class PVInstance :
 	public Instance
 {
 public:
 	PVInstance(void);
 	~PVInstance(void);
 	PVInstance(const PVInstance &oinst);
 	virtual void postRender(RenderDevice* rd);
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
 	bool nameShown;
 };
--- a/PartInstance.cpp
+++ b/PartInstance.cpp
@@ -0,0 +1,603 @@
 #include "PartInstance.h"
 #include "Globals.h"
 #include <sstream>
 #include <iomanip>
 PartInstance::PartInstance(void) : _bevelSize(0.07f), _parseVert(0), _debugTimer(0)
 {
 	PVInstance::PVInstance();
    glList = glGenLists(1);
 	name = "Unnamed PVItem";
 	className = "Part";
 	canCollide = true;
 	anchored = true;
 	size = Vector3(2,1,4);
 	setCFrame(CoordinateFrame(Vector3(0,0,0)));
 	color = Color3::gray();
 	velocity = Vector3(0,0,0);
 	rotVelocity = Vector3(0,0,0);
 	top = Enum::SurfaceType::Smooth;
    front = Enum::SurfaceType::Smooth;
    right = Enum::SurfaceType::Smooth;
 	back = Enum::SurfaceType::Smooth;
 	left = Enum::SurfaceType::Smooth;
 	bottom = Enum::SurfaceType::Smooth;
 	shape = Enum::Shape::Block;
 }
 void PartInstance::postRender(RenderDevice *rd)
 {
 	if(!nameShown)
 		return;
 	G3D::GFontRef fnt = NULL;
 	Instance* dm = parent;
 	while(dm != NULL)
 	{
 		if(DataModelInstance* mod = dynamic_cast<DataModelInstance*>(dm))
 		{
 			fnt = mod->font;
 			break;
 		}
 		dm = dm->getParent();
 	}
 	if(!fnt.isNull())
 	{
 		Vector3 gamepoint = position + Vector3(0,1.5,0);
 		Vector3 camerapoint = rd->getCameraToWorldMatrix().translation;
 		float distance = pow(pow((double)gamepoint.x - (double)camerapoint.x, 2) + pow((double)gamepoint.y - (double)camerapoint.y, 2) + pow((double)gamepoint.z - (double)camerapoint.z, 2), 0.5);
 		if(distance < 100 && distance > -100)
 		{
 			if(distance < 0)
 			distance = distance*-1;
 			glDisable(GL_DEPTH_TEST); 
 			fnt->draw3D(rd, name, CoordinateFrame(rd->getCameraToWorldMatrix().rotation, gamepoint), 0.03*distance, Color3::yellow(), Color3::black(), G3D::GFont::XALIGN_CENTER, G3D::GFont::YALIGN_CENTER);
 			glEnable(GL_DEPTH_TEST); 
 		}
 	}
 }
 PartInstance::PartInstance(const PartInstance &oinst)  : _bevelSize(0.07f), _parseVert(0), _debugTimer(0)
 {
 	PVInstance::PVInstance(oinst);
 	glList = glGenLists(1);
 	//name = oinst.name;
 	//className = "Part";
 	name = oinst.name;
 	canCollide = oinst.canCollide;
 	setParent(oinst.parent);
 	anchored = oinst.anchored;
 	size = oinst.size;
 	setCFrame(oinst.cFrame);
 	color = oinst.color;
 	velocity = oinst.velocity;
 	rotVelocity = oinst.rotVelocity;
 	top = oinst.top;
 	front = oinst.front;
 	right = oinst.right;
 	back = oinst.back;
 	left = oinst.left;
 	bottom = oinst.bottom;
 	shape = oinst.shape;
 	changed = true;
 }
 void PartInstance::setSize(Vector3 newSize)
 {
 	int minsize = 1;
 	int maxsize = 512;
 	changed = true;
 	int sizex = (int)newSize.x;
 	if(sizex <= 0)
 		sizex = 1;
 	if(sizex > 512)
 		sizex = 512;
 	int sizey = (int)newSize.y;
 	if(sizey <= 0)
 		sizey = 1;
 	if(sizey > 512)
 		sizey = 512;
 	int sizez = (int)newSize.z;
 	if(sizez <= 0)
 		sizez = 1;
 	if(sizez > 512)
 		sizez = 512;
 	if(shape != Enum::Shape::Block)
 	{
 		int max = sizex;
 		if(sizey > max)
 			max = sizey;
 		if(sizez > max)
 			max = sizez;
 		sizex = sizey = sizez = max;
 	}
 	size = Vector3(sizex, sizey, sizez);
 }
 Vector3 PartInstance::getSize()
 {
 	return size;
 }
 Vector3 PartInstance::getPosition()
 {
 	return position;
 }
 void PartInstance::setPosition(Vector3 pos)
 {
 	position = pos;
 	cFrame = CoordinateFrame(pos);
 	changed = true;
 }
 CoordinateFrame PartInstance::getCFrame()
 {
 	return cFrame;
 }
 void PartInstance::setCFrame(CoordinateFrame coordinateFrame)
 {
 	cFrame = coordinateFrame;
 	position = coordinateFrame.translation;
 	changed = true;
 }
 // Can probably be deleted
 CoordinateFrame PartInstance::getCFrameRenderBased()
 {
 	return cFrame;//CoordinateFrame(getCFrame().rotation,Vector3(getCFrame().translation.x, getCFrame().translation.y, getCFrame().translation.z));
 }
 // Start Physics stuff
 float PartInstance::getMass()
 {
 	if(shape == Enum::Shape::Sphere || shape == Enum::Shape::Cylinder){
 		return (4/3) * 3.1415926535 * pow(size.x/2, 3);
 	}
 	return size.x * size.y * size.z;
 }
 #ifdef NEW_BOX_RENDER
 Box PartInstance::getBox()
 {	
 	Box box = Box(Vector3(size.x/2, size.y/2, size.z/2) ,Vector3(-size.x/2,-size.y/2,-size.z/2));
 	CoordinateFrame c = getCFrameRenderBased();
 	itemBox = c.toWorldSpace(box);
 	return itemBox;
 }
 #else
 Box PartInstance::getBox()
 {
 	if(changed)
 	{
 		Box box = Box(Vector3(0+size.x/4, 0+size.y/4, 0+size.z/4) ,Vector3(0-size.x/4,0-size.y/4,0-size.z/4));
 		CoordinateFrame c = getCFrameRenderBased();
 		itemBox = c.toWorldSpace(box);
 		Vector3 v0,v1,v2,v3;
 		for (int f = 0; f < 6; f++) {
 			itemBox.getFaceCorners(f, v0,v1,v2,v3);
 			_vertices[f*16] = v0.x;
 			_vertices[(f*16)+1] = v0.y;
 			_vertices[(f*16)+2] = v0.z;
 			_vertices[(f*16)+3] = v1.x;
 			_vertices[(f*16)+4] = v1.y;
 			_vertices[(f*16)+5] = v1.z;
 			_vertices[(f*16)+6] = v2.x;
 			_vertices[(f*16)+7] = v2.y;
 			_vertices[(f*16)+8] = v2.z;
 			_vertices[(f*16)+9] = v3.x;
 			_vertices[(f*16)+10] = v3.y;
 			_vertices[(f*16)+11] = v3.z;
 			_vertices[(f*16)+12] = color.r;
 			_vertices[(f*16)+13] = color.g;
 			_vertices[(f*16)+14] = color.b;
 			_vertices[(f*16)+15] = 1;
 		}
 	}
 	return itemBox;
 }
 #endif
 bool PartInstance::collides(Box box)
 {
 	return CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(getBox(), box);
 }
 void PartInstance::addVertex(Vector3 vertexPos,Color3 color)
 {
 	_vertices.push_back(vertexPos.x);
 	_vertices.push_back(vertexPos.y);
 	_vertices.push_back(vertexPos.z);
 	_vertices.push_back(color.r);
 	_vertices.push_back(color.g);
 	_vertices.push_back(color.b);
 }
 void PartInstance::addNormals(Vector3 normal)
 {
 	for (unsigned int i=0;i<3;i+=1) {
 		_normals.push_back(normal.x);
 		_normals.push_back(normal.y);
 		_normals.push_back(normal.z);
 	}
 }
 void PartInstance::addSingularNormal(Vector3 normal)
 {
 		_normals.push_back(normal.x);
 		_normals.push_back(normal.y);
 		_normals.push_back(normal.z);
 }
 void PartInstance::addTriangle(Vector3 v1,Vector3 v2,Vector3 v3)
 {
 	addVertex(v1,color);
 	addVertex(v2,color);
 	addVertex(v3,color);
 	//addNormals(cross(v2-v1,v3-v1).direction());
 	addSingularNormal(cross(v2-v1,v3-v1).direction());
 	addSingularNormal(cross(v3-v2,v1-v2).direction());
 	addSingularNormal(cross(v1-v3,v2-v3).direction());
 }
 void PartInstance::debugPrintVertexIDs(RenderDevice* rd,GFontRef font,Matrix3 rot)
 {
 	_debugUniqueVertices.clear();
 	glDisable(GL_DEPTH_TEST);
 	for (unsigned int i=0;i<_vertices.size();i+=6)
 	{
 		std::stringstream stream;
 		stream << std::fixed << std::setprecision(1) << i;
 		Vector3 testVector = Vector3(_vertices[i],_vertices[i+1],_vertices[i+2]);
 		if (isUniqueVertex(testVector))
 		{
 			font->draw3D(rd, stream.str(), CoordinateFrame(testVector) * -rot, 0.05, Color3::fromARGB(0xFF4F0000), Color4::clear());
 			_debugUniqueVertices.push_back(testVector);
 		}
 	}
 	glEnable(GL_DEPTH_TEST);
 }
 void PartInstance::makeFace(int vertex1,int vertex2, int vertex3)
 {
 	addTriangle(Vector3(_vertices[vertex1],_vertices[vertex1+1],_vertices[vertex1+2]),
 		Vector3(_vertices[vertex2],_vertices[vertex2+1],_vertices[vertex2+2]),
 		Vector3(_vertices[vertex3],_vertices[vertex3+1],_vertices[vertex3+2]));
 }
 bool PartInstance::isUniqueVertex(Vector3 pos)
 {
 	for (unsigned int i=0;i<_debugUniqueVertices.size();i+=1)
 	{
 		if (pos==_debugUniqueVertices[i])
 		{
 			return false;
 		}
 	}
 	return true;
 }
 #ifdef NEW_BOX_RENDER
 void PartInstance::render(RenderDevice* rd) {
 	if(nameShown)
 		postRenderStack.push_back(this);
 	if (changed)
 	{
 		getBox();
 		_vertices.clear();
 		Vector3 renderSize = size/2;
 		// Front
 		addTriangle(Vector3(renderSize.x-_bevelSize,renderSize.y-_bevelSize,renderSize.z),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y+_bevelSize,renderSize.z),
 			Vector3(renderSize.x-_bevelSize,-renderSize.y+_bevelSize,renderSize.z)
 			);
 		addTriangle(Vector3(-renderSize.x+_bevelSize,renderSize.y-_bevelSize,renderSize.z),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y+_bevelSize,renderSize.z),
 			Vector3(renderSize.x-_bevelSize,renderSize.y-_bevelSize,renderSize.z)
 			);
 		// Top
 		addTriangle(Vector3(renderSize.x-_bevelSize,renderSize.y,renderSize.z-_bevelSize),
 			Vector3(renderSize.x-_bevelSize,renderSize.y,-renderSize.z+_bevelSize),
 			Vector3(-renderSize.x+_bevelSize,renderSize.y,renderSize.z-_bevelSize)
 			);
 		addTriangle(Vector3(-renderSize.x+_bevelSize,renderSize.y,renderSize.z-_bevelSize),
 			Vector3(renderSize.x-_bevelSize,renderSize.y,-renderSize.z+_bevelSize),
 			Vector3(-renderSize.x+_bevelSize,renderSize.y,-renderSize.z+_bevelSize)
 			);
 		// Back
 		addTriangle(Vector3(renderSize.x-_bevelSize,renderSize.y-_bevelSize,-renderSize.z),
 			Vector3(renderSize.x-_bevelSize,-renderSize.y+_bevelSize,-renderSize.z),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y+_bevelSize,-renderSize.z)
 			);
 		addTriangle(Vector3(renderSize.x-_bevelSize,renderSize.y-_bevelSize,-renderSize.z),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y+_bevelSize,-renderSize.z),
 			Vector3(-renderSize.x+_bevelSize,renderSize.y-_bevelSize,-renderSize.z)
 			);
 		// Bottom
 		addTriangle(Vector3(renderSize.x-_bevelSize,-renderSize.y,-renderSize.z+_bevelSize),
 			Vector3(renderSize.x-_bevelSize,-renderSize.y,renderSize.z-_bevelSize),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y,renderSize.z-_bevelSize)
 			);
 		addTriangle(Vector3(-renderSize.x+_bevelSize,-renderSize.y,renderSize.z-_bevelSize),
 			Vector3(-renderSize.x+_bevelSize,-renderSize.y,-renderSize.z+_bevelSize),
 			Vector3(renderSize.x-_bevelSize,-renderSize.y,-renderSize.z+_bevelSize)
 			);
 		// Left
 		addTriangle(Vector3(-renderSize.x,renderSize.y-_bevelSize,-renderSize.z+_bevelSize),
 			Vector3(-renderSize.x,-renderSize.y+_bevelSize,renderSize.z-_bevelSize),
 			Vector3(-renderSize.x,renderSize.y-_bevelSize,renderSize.z-_bevelSize)
 			);
 		addTriangle(Vector3(-renderSize.x,-renderSize.y+_bevelSize,renderSize.z-_bevelSize),
 			Vector3(-renderSize.x,renderSize.y-_bevelSize,-renderSize.z+_bevelSize),
 			Vector3(-renderSize.x,-renderSize.y+_bevelSize,-renderSize.z+_bevelSize)
 			);
 		// Right
 		addTriangle(Vector3(renderSize.x,renderSize.y-_bevelSize,renderSize.z-_bevelSize),
 			Vector3(renderSize.x,-renderSize.y+_bevelSize,renderSize.z-_bevelSize),
 			Vector3(renderSize.x,renderSize.y-_bevelSize,-renderSize.z+_bevelSize)
 			);
 		addTriangle(Vector3(renderSize.x,-renderSize.y+_bevelSize,-renderSize.z+_bevelSize),
 			Vector3(renderSize.x,renderSize.y-_bevelSize,-renderSize.z+_bevelSize),
 			Vector3(renderSize.x,-renderSize.y+_bevelSize,renderSize.z-_bevelSize)
 			);
 		// Bevel Top Front
 		makeFace(0,36,48);
 		makeFace(48,18,0);
 		// Bevel Left Front Corner
 		makeFace(18,156,162);
 		makeFace(24,18,162);
 		// Bevel Left Front Top Corner
 		makeFace(48,156,18);
 		// Bevel Left Front Bottom Corner
 		makeFace(120,6,150);
 		// Bevel Left Top
 		makeFace(48,66,156);
 		makeFace(144,156,66);
 		// Bevel Bottom
 		makeFace(6,120,114);
 		makeFace(114,12,6);
 		// Left Bottom
 		makeFace(120,150,174);
 		makeFace(174,132,120);
 		// Right Front Top Corner
 		makeFace(36,0,180);
 		// Right Front Corner
 		makeFace(180,0,12);
 		makeFace(186,180,12);
 		// Right Front Bottom Corner
 		makeFace(186,12,114);
 		// Right Bottom
 		makeFace(186,114,108);
 		makeFace(108,198,186);
 		// Right Top Corner
 		makeFace(180,192,36);
 		makeFace(192,42,36);
 		// Right Back Top Corner
 		makeFace(72,42,192);
 		// Right Back Bottom Corner
 		makeFace(78,198,108);
 		// Right Back Corner
 		makeFace(72,192,198);
 		makeFace(198,78,72);
 		// Back Bottom Corner
 		makeFace(78,108,132);
 		makeFace(132,84,78);
 		// Back Top
 		makeFace(42,72,102);
 		makeFace(102,66,42);
 		// Back Left Top Corner
 		makeFace(144,66,102);
 		// Back Left Corner
 		makeFace(144,102,84);
 		makeFace(84,174,144);
 		// Back Left Bottom Corner
 		makeFace(174,84,132);
 		for (unsigned short i=0;i<_vertices.size()/6;i++) {
 			_indices.push_back(i);
 		}		
 		changed=false;
 		glNewList(glList, GL_COMPILE);
 		glVertexPointer(3, GL_FLOAT,6 * sizeof(GLfloat), &_vertices[0]);
 		glColorPointer(3, GL_FLOAT,6 * sizeof(GLfloat), &_vertices[3]);
 		glNormalPointer(GL_FLOAT,3 * sizeof(GLfloat), &_normals[0]);
 		glPushMatrix();
 		//glTranslatef(2,7,0);
 		glDrawElements(GL_TRIANGLES, _indices.size(), GL_UNSIGNED_SHORT, &_indices[0]);
 		glPopMatrix();
 		glEndList();
 	}
 	rd->setObjectToWorldMatrix(cFrame);
 	glCallList(glList);
 	//rd->setObjectToWorldMatrix(cFrame);
 }
 #else
 void PartInstance::render(RenderDevice* rd)
 {
 	if(changed)
 		Box box = getBox();
 	glColor(color);
 	/*glEnable( GL_TEXTURE_2D );
 	glEnable(GL_BLEND);// you enable blending function
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
 	glBindTexture( GL_TEXTURE_2D, Globals::surfaceId);
 	glBegin(GL_QUADS);*/
    for(int i = 0; i < 96; i+=16)
 	{
 		double add = 0.8;
 		Enum::SurfaceType::Value face;
 		if(i == 0)//Back
 			face = back;
 		else if(i == 16)//Right
 			face = right;
 		else if(i == 32)//Front
 			face = front;
 		else if(i == 48)//Top
 			face = top;
 		else if(i == 64)//Left
 			face = left;
 		else if(i == 80)//Bottom
 			face = bottom;
 		/*if(face == Snaps)
 			add = 0.0;
 		else if(face == Inlets)
 			add = 0.2;*/
 		Vector3 v0 = Vector3(_vertices[i], _vertices[i+1], _vertices[i+2]), v1 = Vector3(_vertices[i+3], _vertices[i+4], _vertices[i+5]), v3 = Vector3(_vertices[i+9], _vertices[i+10], _vertices[i+11]);
 		/*glNormal3fv((v1 - v0).cross(v3 - v0).direction());
 		glTexCoord2f(0.0F,0.0F);
 		glVertex3fv(v0);
 		glTexCoord2f(1.0F,0.0F);
 		glVertex3fv(v1);
 		glTexCoord2f(1.0F,0.25F);
 		glVertex3f(_vertices[i+6], _vertices[i+7], _vertices[i+8]);
 		glTexCoord2f(0.0F,0.25F);
 		glVertex3fv(v3);*/
 		glEnable( GL_TEXTURE_2D );
 		glEnable(GL_BLEND);// you enable blending function
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
 		glBindTexture( GL_TEXTURE_2D, Globals::surfaceId);
 		glBegin( GL_QUADS );
 		glNormal3fv((v1 - v0).cross(v3 - v0).direction());
 		glTexCoord2d(0.0,0.0+add);
 		glVertex3fv(v0);
 		glTexCoord2d( 1.0,0.0+add);
 		glVertex3fv(v1);
 		glTexCoord2d(1.0,0.2+add);
 		glVertex3f(_vertices[i+6], _vertices[i+7], _vertices[i+8]);
 		glTexCoord2d( 0.0,0.2+add);
 		glVertex3fv(v3);
 		glEnd();
 		glDisable( GL_TEXTURE_2D );
 	}
 	/*glEnd();
 	glDisable(GL_TEXTURE_2D);*/
 	glColor(Color3::white());
 	if(!children.empty())
 	{
 		for(size_t i = 0; i < children.size(); i++)
 		{
 			children.at(i)->render(rd);
 		}
 	}
 }
 #endif
 PartInstance::~PartInstance(void)
 {
 	glDeleteLists(glList, 1);
 }
 char pto[512];
 char pto2[512];
 #include <sstream>
 void PartInstance::PropUpdate(LPPROPGRIDITEM &item)
 {
 	if(strcmp(item->lpszPropName, "Color3") == 0)
 	{
 		color = Color3(GetRValue(item->lpCurValue)/255.0F,GetGValue(item->lpCurValue)/255.0F,GetBValue(item->lpCurValue)/255.0F);
 		changed=true;
 	}
 	else if(strcmp(item->lpszPropName, "Offset") == 0)
 	{
 		std::string str = (LPTSTR)item->lpCurValue;
 		std::vector<float> vect;
 		std::stringstream ss(str);
 		float i;
 		while (ss >> i)
 		{
 			vect.push_back(i);
 			if (ss.peek() == ',')
 				ss.ignore();
 		}
 		if(vect.size() != 3)
 		{
 			sprintf(pto, "%g, %g, %g", cFrame.translation.x, cFrame.translation.y, cFrame.translation.z, "what");
 			LPCSTR str = LPCSTR(pto);
 			item->lpCurValue = (LPARAM)str;
 		}
 		else
 		{
 			Vector3 pos(vect.at(0),vect.at(1),vect.at(2));
 			setPosition(pos);
 		}
 	}
 	else if(strcmp(item->lpszPropName, "Size") == 0)
 	{
 		std::string str = (LPTSTR)item->lpCurValue;
 		std::vector<float> vect;
 		std::stringstream ss(str);
 		float i;
 		while (ss >> i)
 		{
 			vect.push_back(i);
 			if (ss.peek() == ',')
 				ss.ignore();
 		}
 		if(vect.size() != 3)
 		{
 			sprintf(pto, "%g, %g, %g", cFrame.translation.x, cFrame.translation.y, cFrame.translation.z, "what");
 			LPCSTR str = LPCSTR(pto);
 			item->lpCurValue = (LPARAM)str;
 		}
 		else
 		{
 			Vector3 size(vect.at(0),vect.at(1),vect.at(2));
 			setSize(size);
 		}
 	}
 	else PVInstance::PropUpdate(item);
 }
 std::vector<PROPGRIDITEM> PartInstance::getProperties()
 {
 	std::vector<PROPGRIDITEM> properties = PVInstance::getProperties();
 	properties.push_back(createPGI(
 		"Properties",
 		"Color3",
 		"The color of the selected part",
 		RGB((color.r*255),(color.g*255),(color.b*255)),
 		PIT_COLOR
 		));
 	sprintf(pto, "%g, %g, %g", cFrame.translation.x, cFrame.translation.y, cFrame.translation.z);
 	properties.push_back(createPGI(
 		"Item",
 		"Offset",
 		"The position of the object in the workspace",
 		(LPARAM)pto,
 		PIT_EDIT
 		));
 	sprintf(pto2, "%g, %g, %g", size.x, size.y, size.z);
 	properties.push_back(createPGI(
 		"Item",
 		"Size",
 		"The position of the object in the workspace",
 		(LPARAM)pto2,
 		PIT_EDIT
 		));
 	return properties;
 }
--- a/src/include/DataModelV2/PartInstance.h
+++ b/src/include/DataModelV2/PartInstance.h
@@ -1,23 +1,19 @@
 #pragma once
 #include "PVInstance.h"
 #include "Enum.h"
-#define _USE_MATH_DEFINES
+
-#include <cmath>
+#define NEW_BOX_RENDER
 class PartInstance : public PVInstance
 {
 public:
 	PartInstance(void);
 	PartInstance(const PartInstance &oinst);
 	~PartInstance(void);
 	Instance* clone() const { return new PartInstance(*this); }
 	//Rendering
 	virtual void PartInstance::postRender(RenderDevice* rd);
 	~PartInstance(void);
 	virtual void render(RenderDevice*);
-	
+	Vector3 velocity;
 	//Surfaces
 	Enum::SurfaceType::Value top;
 	Enum::SurfaceType::Value front;
 	Enum::SurfaceType::Value right;
@@ -25,52 +21,46 @@ public:
 	Enum::SurfaceType::Value left;
 	Enum::SurfaceType::Value bottom;
 	Enum::Shape::Value shape;
-
+	CoordinateFrame cFrame;
 	//Variables
 	Color3 color;
 	bool canCollide;
 	dBodyID physBody;
 	dGeomID physGeom[3];
 	//Getters
 	Vector3 getPosition();
 	Vector3 getVelocity();
 	Vector3 getRotVelocity();
 	Vector3 getSize();
 	Box getBox();
 	Sphere getSphere();
 	Box getScaledBox();
 	CoordinateFrame getCFrame();
 	//Setters
 	void setParent(Instance* parent);
 	void setPosition(Vector3);
-	void setVelocity(Vector3);
+	CoordinateFrame getCFrame();
 	void setRotVelocity(Vector3);
 	void setCFrame(CoordinateFrame);
-	void setCFrameNoSync(CoordinateFrame);
+	Box getBox();
 	Box getScaledBox();
 	CoordinateFrame getCFrameRenderBased();
 	Vector3 getSize();
 	void setSize(Vector3);
-	void setShape(Enum::Shape::Value shape);
+	bool canCollide;
-	void setChanged();
+	bool anchored;
-	void setSurface(int face, Enum::SurfaceType::Value surface);
+	Vector3 rotVelocity;
 	void setAnchored(bool anchored);
 	bool isAnchored();
 	float getMass();
 	//Collision
 	bool collides(PartInstance * part);
 	bool collides(Box);
 	//Properties
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
 	void addVertex(Vector3 vertexPos,Color3 color);
 	void addNormals(Vector3 normal);
 	void addSingularNormal(Vector3 normal);
 	void addTriangle(Vector3 vertexPos,Vector3 vertexPos2, Vector3 vertexPos3);
 	void debugPrintVertexIDs(RenderDevice* rd, GFontRef font, Matrix3 camRot);
 	void makeFace(int vertex1, int vertex2, int vertex3);
 	bool isUniqueVertex(Vector3 pos);
 	float getMass();
 private:
 	bool anchored;
 	Vector3 position;
 	Vector3 size;
-	Vector3 velocity;
+	float	_bevelSize;
-	Vector3 rotVelocity;
+	int		_parseVert;
 	int		_debugTimer;
 	std::vector<Vector3> _debugUniqueVertices;
 	#ifdef NEW_BOX_RENDER
 		std::vector<GLfloat> _vertices;
 		std::vector<GLfloat> _normals;
 	#else
 		GLfloat _vertices[96];
 	#endif
 	std::vector<GLushort> _indices;
 	bool changed;
 	Box itemBox;
 	GLuint glList;
-};
+};
--- a/Parts.bmp
+++ b/Parts.bmp
--- a/src/source/PropertyWindow.cpp
+++ b/src/source/PropertyWindow.cpp
@@ -5,7 +5,10 @@
 #include "PropertyWindow.h"
 #include "Globals.h"
 #include "strsafe.h"
-#include "Application.h"
+/*typedef struct typPRGP {
    Instance* instance;   // Declare member types
    Property &prop;
 } PRGP;*/
 std::vector<PROPGRIDITEM> prop;
 std::vector<Instance*> children;
@@ -14,49 +17,6 @@ Instance * parent = NULL;
 const int CX_BITMAP = 16;
 const int CY_BITMAP = 16;
 HBITMAP CreateBitmapMask(HBITMAP hbmColour, COLORREF crTransparent)
 {
    HDC hdcMem, hdcMem2;
    HBITMAP hbmMask;
    BITMAP bm;
    // Create monochrome (1 bit) mask bitmap.  
    GetObject(hbmColour, sizeof(BITMAP), &bm);
    hbmMask = CreateBitmap(bm.bmWidth, bm.bmHeight, 1, 1, NULL);
    // Get some HDCs that are compatible with the display driver
    hdcMem = CreateCompatibleDC(0);
    hdcMem2 = CreateCompatibleDC(0);
    SelectObject(hdcMem, hbmColour);
    SelectObject(hdcMem2, hbmMask);
    // Set the background colour of the colour image to the colour
    // you want to be transparent.
    SetBkColor(hdcMem, crTransparent);
    // Copy the bits from the colour image to the B+W mask... everything
    // with the background colour ends up white while everythig else ends up
    // black...Just what we wanted.
    BitBlt(hdcMem2, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
    // Take our new mask and use it to turn the transparent colour in our
    // original colour image to black so the transparency effect will
    // work right.
    BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem2, 0, 0, SRCINVERT);
    // Clean up.
    DeleteDC(hdcMem);
    DeleteDC(hdcMem2);
    return hbmMask;
 }
 LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	TCHAR achTemp[256];
@@ -90,7 +50,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				// Get the food icon from the item data.
 				HBITMAP hbmIcon = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_BITMAP1));
-				HBITMAP hbmMask = CreateBitmapMask(hbmIcon, RGB(255, 0, 220));
+				HBITMAP hbmMask = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_BITMAP1));
 				// The colors depend on whether the item is selected.
 				clrForeground = SetTextColor(lpdis->hDC, 
 					GetSysColor(lpdis->itemState & ODS_SELECTED ?
@@ -106,16 +66,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				x = LOWORD(GetDialogBaseUnits()) / 4;
 				// Get and display the text for the list item.
 				int mul = 0;
 				SendMessage(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID, (LPARAM) achTemp);
 				if(lpdis->itemID >= 0)
 				{
 					mul = children[lpdis->itemID]->listicon;
 				}
 				//else mul = children[lpdis->itemID-1]->listicon;
 				//mul = children[lpdis->itemID]->listicon;
 				hr = StringCchLength(achTemp, 256, &cch);
 				if (FAILED(hr))
@@ -137,12 +88,12 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					break; 
 				SelectObject(hdc, hbmMask); 
-				BitBlt(lpdis->hDC, x, lpdis->rcItem.top, 
+				BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1, 
-					CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCAND); 
+					CX_BITMAP, CY_BITMAP, hdc, 0, 0, SRCAND); 
 				SelectObject(hdc, hbmIcon); 
-				BitBlt(lpdis->hDC, x, lpdis->rcItem.top, 
+				BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1, 
-					CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCPAINT); 
+					CX_BITMAP, CY_BITMAP, hdc, 0, 0, SRCPAINT); 
 				DeleteDC(hdc); 
@@ -172,8 +123,32 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					int ItemIndex = SendMessage((HWND) lParam, (UINT) CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
 					CHAR  ListItem[256];
 					SendMessage((HWND) lParam, (UINT) CB_GETLBTEXT, (WPARAM) ItemIndex, (LPARAM) ListItem); 
-					propWind->ClearProperties();
+					if(ItemIndex != 0)
-					g_usableApp->selectInstance(children.at(ItemIndex),propWind);
+					{
 						propWind->ClearProperties();
 						while(g_selectedInstances.size() != 0)
 							g_selectedInstances.erase(g_selectedInstances.begin());
 						if(parent != NULL)
 						{
 							std::cout << ItemIndex << std::endl;
 							if(ItemIndex == 1)
 							{
 								g_selectedInstances.push_back(parent);
 								propWind->SetProperties(parent);
 							}
 							else
 							{
 								g_selectedInstances.push_back(children.at(ItemIndex+2));
 								propWind->SetProperties(children.at(ItemIndex+2));
 							}
 						}
 						else
 						{
 							g_selectedInstances.push_back(children.at(ItemIndex-1));
 							propWind->SetProperties(children.at(ItemIndex-1));
 						}
 					}
 				}
 			}
 		break;
@@ -189,7 +164,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                        LPNMPROPGRID lpnmp = (LPNMPROPGRID)pnm;
                        LPPROPGRIDITEM item = PropGrid_GetItemData(pnm->hwndFrom,lpnmp->iIndex);
 						selectedInstance->PropUpdate(item);
-						//propWind->UpdateSelected(selectedInstance);
+						//propWind->SetProperties(selectedInstance);
                    }
 				}
                break;
@@ -203,35 +178,28 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return 0; 
 }
-void PropertyWindow::refreshExplorer(Instance* selectedInstance)
+void PropertyWindow::refreshExplorer()
 {
 	SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0); 
 	parent = NULL;
-	children.clear();
+	for (unsigned int i=0;i<g_selectedInstances.size();i++) {
-	//g_selectedInstances.clear();
+		
-	//for (unsigned int i=0;i<g_selectedInstances.size();i++) {
+		SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)g_selectedInstances[i]->name.c_str()); 
-	children.push_back(selectedInstance);
+		if(g_selectedInstances[i]->getParent() != NULL)
-	SendMessage(_explorerComboBox, CB_ADDSTRING, 0, (LPARAM)selectedInstance->name.c_str()); 
+		{
-	if(selectedInstance->getParent() != NULL)
+			std::string title = ".. (";
-	{
+			title += g_selectedInstances[i]->getParent()->name;
-		std::string title = ".. (";
+			title += ")";
-		title += selectedInstance->getParent()->name;
+			SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)title.c_str());
-		title += ")";
+			parent = g_selectedInstances[i]->getParent();
-		SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)title.c_str());
+		}
-		parent = selectedInstance->getParent();
+		children = g_selectedInstances[i]->getChildren();
-		children.push_back(selectedInstance->getParent());
+		for(size_t z = 0; z < children.size(); z++)
 		{
 			SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)children.at(z)->name.c_str()); 
 		}
 		SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
 	}
 	//children = g_selectedInstances[i]->getChildren();
 	std::vector<Instance*> selectedChildren = selectedInstance->getChildren();
 	for(size_t z = 0; z < selectedChildren.size(); z++)
 	{
 		children.push_back(selectedChildren.at(z));
 		SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)selectedChildren.at(z)->name.c_str()); 
 	}
 	//g_usableApp->selectInstance(selectedInstance, this);
 	SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
 	//}
 }
 bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstance) {
@@ -257,7 +225,7 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
 			NULL,
 			"COMBOBOX",
 			"Combo",
-			WS_VISIBLE | WS_CHILD | CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS ,
+			WS_VISIBLE | WS_CHILD | CBS_DROPDOWNLIST,
 			0,
 			0,
 			0,
@@ -315,7 +283,7 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
 		SetWindowLongPtr(_hwndProp,GWL_USERDATA,(LONG)this);
-		//refreshExplorer();
+		refreshExplorer();
 		_resize();
 		return true;
@@ -338,27 +306,24 @@ void PropertyWindow::_resize()
 	SetWindowPos(_explorerComboBox, NULL, 0, 0, rect.right, 400, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
-void PropertyWindow::UpdateSelected(Instance * instance)
+void PropertyWindow::SetProperties(Instance * instance)
 {
 	PropGrid_ResetContent(_propGrid);
 	prop = instance->getProperties();
-	if (selectedInstance != instance)
+	selectedInstance = instance;
 	for(size_t i = 0; i < prop.size(); i++)
 	{
-		selectedInstance = instance;
+		::PROPGRIDITEM item = prop.at(i);
-		for(size_t i = 0; i < prop.size(); i++)
+		PropGrid_AddItem(_propGrid, &item);
-		{
+		//PRGP propgp;
-			::PROPGRIDITEM item = prop.at(i);
+		//propgp.instance = instance;
-			PropGrid_AddItem(_propGrid, &item);
+		//propgp.prop = prop.at(i);
 			//PRGP propgp;
 			//propgp.instance = instance;
 			//propgp.prop = prop.at(i);
 		}
 		PropGrid_ExpandAllCatalogs(_propGrid);
 		//SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);
 		refreshExplorer(instance);
 		_resize();
 	}
 	PropGrid_ExpandAllCatalogs(_propGrid);
 	//SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);
 	refreshExplorer();
 	_resize();
 }
 void PropertyWindow::ClearProperties()
--- a/src/include/PropertyWindow.h
+++ b/src/include/PropertyWindow.h
@@ -1,14 +1,13 @@
 #pragma once
-#include "DataModelV2/Instance.h"
+#include "Instance.h"
 class PropertyWindow {
 public:
 	PropertyWindow(int x, int y, int sx, int sy, HMODULE hThisInstance);
 	bool	onCreate(int x, int y, int sx, int sy, HMODULE hThisInstance);
-	void	UpdateSelected(Instance *);
+	void	SetProperties(Instance *);
 	void	ClearProperties();
 	void	onResize();
-	void	refreshExplorer(Instance* selectedInstance);
+	void	refreshExplorer();
 	HWND	_hwndProp;
 private:
 	HWND	_propGrid;
--- a/src/source/DataModelV2/TextButtonInstance.cpp
+++ b/src/source/DataModelV2/TextButtonInstance.cpp
@@ -1,4 +1,4 @@
-#include "DataModelV2/TextButtonInstance.h"
+#include "TextButtonInstance.h"
 TextButtonInstance::TextButtonInstance(void)
@@ -98,7 +98,12 @@ void TextButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseD
 		Draw::box(Box(point1, point2), rd, boxColorDn, boxOutlineColorDn);
 		font->draw2D(rd, title, RelativeTo, textSize, textColorDn, textOutlineColorDn);
 	}
-	else if(selected || mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y))
+	else if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y))
 	{
 		Draw::box(Box(point1, point2), rd, boxColorOvr, boxOutlineColorOvr);
 		font->draw2D(rd, title, RelativeTo, textSize, textColorOvr, textOutlineColorOvr);
 	}
 	else if(selected)
 	{
 		Draw::box(Box(point1, point2), rd, boxColorOvr, boxOutlineColorOvr);
 		font->draw2D(rd, title, RelativeTo, textSize, textColorOvr, textOutlineColorOvr);
--- a/src/include/DataModelV2/TextButtonInstance.h
+++ b/src/include/DataModelV2/TextButtonInstance.h
--- a/src/source/WindowFunctions.cpp
+++ b/src/source/WindowFunctions.cpp
@@ -1,6 +1,7 @@
 #include "WindowFunctions.h"
 #include <sstream>
 #include <string>
 using namespace std;
@@ -23,7 +24,7 @@ bool createWindowClass(const char* name,WNDPROC proc,HMODULE hInstance)
 	{
 		stringstream errMsg;
 		errMsg<<"Failed to register " << name;
-		MessageBox(NULL, errMsg.str().c_str(),"Blocks3D Crash", MB_OK);
+		MessageBox(NULL, errMsg.str().c_str(),"Dynamica Crash", MB_OK);
 		return false;
 	}
 	return true;
--- a/src/include/WindowFunctions.h
+++ b/src/include/WindowFunctions.h
@@ -1,5 +1,4 @@
 #pragma once
 #include <windows.h>
 bool createWindowClass(const char* name,WNDPROC proc,HMODULE hInstance);
--- a/src/source/DataModel/WorkspaceInstance.cpp
+++ b/src/source/DataModel/WorkspaceInstance.cpp
@@ -1,4 +1,4 @@
-#include "DataModel/WorkspaceInstance.h"
+#include "WorkspaceInstance.h"
 WorkspaceInstance::WorkspaceInstance(void)
--- a/src/include/DataModelV2/WorkspaceInstance.h
+++ b/src/include/DataModelV2/WorkspaceInstance.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "GroupInstance.h"
 #include "PartInstance.h"
 class WorkspaceInstance :
 	public GroupInstance
@@ -8,7 +7,4 @@ class WorkspaceInstance :
 public:
 	WorkspaceInstance(void);
 	~WorkspaceInstance(void);
 	void clearChildren();
 	void zoomToExtents();
 	std::vector<PartInstance *> partObjects;
 };
--- a/src/source/ax.cpp
+++ b/src/source/ax.cpp
@@ -1,13 +1,17 @@
 // AX.CPP
 #include <windows.h>
 #include <comdef.h>
 #include <exdisp.h>
 #include <oledlg.h>
 #include "ax.h"
-#include "AudioPlayer.h"
+
 #include "Enum.h"
 #pragma warning (disable: 4311)
 #pragma warning (disable: 4312)
 #pragma warning (disable: 4244)
 #pragma warning (disable: 4800)
 // AXClientSite class
 // ------- Implement member functions
 AXClientSite :: AXClientSite()
@@ -22,89 +26,10 @@ AXClientSite :: ~AXClientSite()
   }
 STDMETHODIMP AXClientSite :: ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: GetHostInfo(DOCHOSTUIINFO *pInfo)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: ShowUI( DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: HideUI( void)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: UpdateUI( void)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: OnDocWindowActivate(BOOL fActivate)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: OnFrameWindowActivate(BOOL fActivate)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: ResizeBorder( LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: TranslateAccelerator( LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: GetOptionKeyPath( LPOLESTR *pchKey, DWORD dw)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: GetDropTarget( IDropTarget *pDropTarget, IDropTarget **ppDropTarget)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: GetExternal(IDispatch **ppDispatch)
 {
 	//IDispatch* disp = ax->GetExternalDispatch();
 	*ppDispatch = this;
 	/* if (disp!=NULL)
 	{
 		*ppDispatch = this;
 		return S_OK;
 	} */
 	return S_OK;
 }
 STDMETHODIMP AXClientSite ::TranslateUrl( DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut)
 {
 	return E_NOTIMPL;
 }
 STDMETHODIMP AXClientSite :: FilterDataObject( IDataObject *pDO, IDataObject **ppDORet)
 {
 	return E_NOTIMPL;
 }
 // IUnknown methods
 STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
      {
      *ppvObject = 0;
 	 // if (iid == IID_IOleInPlaceSite)
       //  *ppvObject = (IOleInPlaceSite*)this;
      if (iid == IID_IOleClientSite)
         *ppvObject = (IOleClientSite*)this;
      if (iid == IID_IUnknown)
@@ -113,7 +38,7 @@ STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
         *ppvObject = (IAdviseSink*)this;
      if (iid == IID_IDispatch)
         *ppvObject = (IDispatch*)this;
-      //if (ExternalPlace == false)
+      if (ExternalPlace == false)
      	{
 	      if (iid == IID_IOleInPlaceSite)
 	         *ppvObject = (IOleInPlaceSite*)this;
@@ -121,8 +46,6 @@ STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
 	         *ppvObject = (IOleInPlaceFrame*)this;
 	      if (iid == IID_IOleInPlaceUIWindow)
 	         *ppvObject = (IOleInPlaceUIWindow*)this;
 		  if (iid == IID_IDocHostUIHandler)
 	         *ppvObject = (IDocHostUIHandler*)this;
         }
      //* Log Call
@@ -306,9 +229,9 @@ STDMETHODIMP AXClientSite :: SetActiveObject(IOleInPlaceActiveObject*pV,LPCOLEST
 STDMETHODIMP AXClientSite :: SetStatusText(LPCOLESTR t)
-{
+      {
      return E_NOTIMPL;
-}
+      }
 STDMETHODIMP AXClientSite :: EnableModeless(BOOL f)
      {
@@ -328,21 +251,14 @@ HRESULT _stdcall AXClientSite :: GetTypeInfoCount(
 HRESULT _stdcall AXClientSite :: GetTypeInfo(
  unsigned int iTInfo,
  LCID lcid,
-  ITypeInfo FAR* FAR* ppTInfo)
+  ITypeInfo FAR* FAR* ppTInfo) {return E_NOTIMPL;}
 {
 	  return E_NOTIMPL;
 }
 HRESULT _stdcall AXClientSite :: GetIDsOfNames(
  REFIID riid,
-  OLECHAR FAR* FAR* ext_function_name,
+  OLECHAR FAR* FAR*,
  unsigned int cNames,
  LCID lcid,
-  DISPID FAR* )
+  DISPID FAR* ) {return E_NOTIMPL;}
 {
 	m_lastExternalName = *ext_function_name;
 	return S_OK;
 }
 // Other Methods
@@ -368,6 +284,8 @@ AX :: AX(char* cls)
 	Init(cls);
   }
 void AX :: Clean()
      {
      if (Site.InPlace == true)
@@ -504,12 +422,9 @@ HRESULT _stdcall AXClientSite :: Invoke(
  VARIANT FAR* pVarResult,
  EXCEPINFO FAR* pExcepInfo,
  unsigned int FAR* puArgErr)
-{
+  	{
-	IEBrowser * browser = (IEBrowser *)GetProp(Window,"Browser");
+	return E_NOTIMPL;
-	return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+   }
 	//return S_OK;
 }
 void _stdcall AXClientSite :: OnDataChange(FORMATETC *pFormatEtc,STGMEDIUM *pStgmed)
@@ -616,6 +531,7 @@ LRESULT CALLBACK AXWndProc(HWND hh,UINT mm,WPARAM ww,LPARAM ll)
      return true;
      }
   if (mm == AX_GETAXINTERFACE)
      {
      AX* ax = (AX*)GetWindowLong(hh,GWL_USERDATA);
--- a/src/include/ax.h
+++ b/src/include/ax.h
@@ -1,10 +1,4 @@
 // AX.H
 #pragma once
 #include "Globals.h"
 #include <mshtmhst.h>
 #include <string>
 #pragma once
 #include "IEBrowser.h"
 // messages
 #define AX_QUERYINTERFACE (WM_USER + 1)
@@ -15,6 +9,7 @@
 #define AX_SETDATAADVISE (WM_USER + 6)
 #define AX_DOVERB (WM_USER + 7)
 // Registration function
 ATOM AXRegister();
@@ -25,8 +20,7 @@ class AXClientSite :
   public IDispatch,
   public IAdviseSink,
   public IOleInPlaceSite,
-   public IOleInPlaceFrame,
+   public IOleInPlaceFrame
   public IDocHostUIHandler
   {
   protected:
@@ -34,6 +28,7 @@ class AXClientSite :
   public:
 		HWND Window;
 		HWND Parent;
 		HMENU Menu;
@@ -42,6 +37,7 @@ class AXClientSite :
 		bool CalledCanInPlace;
 		class AX* ax;
 	   // MyClientSite Methods
 		AXClientSite();
 		virtual ~AXClientSite();
@@ -59,64 +55,7 @@ class AXClientSite :
 		STDMETHODIMP ShowObject();
 		STDMETHODIMP OnShowWindow(BOOL f);
 		STDMETHODIMP RequestNewObjectLayout();
-
+	
 		// IDDocHandler methods
 		STDMETHODIMP ShowContextMenu( 
            /* [in] */ DWORD dwID,
            /* [in] */ POINT *ppt,
            /* [in] */ IUnknown *pcmdtReserved,
            /* [in] */ IDispatch *pdispReserved);
        STDMETHODIMP GetHostInfo( 
            /* [out][in] */ DOCHOSTUIINFO *pInfo);
        STDMETHODIMP ShowUI( 
            /* [in] */ DWORD dwID,
            /* [in] */ IOleInPlaceActiveObject *pActiveObject,
            /* [in] */ IOleCommandTarget *pCommandTarget,
            /* [in] */ IOleInPlaceFrame *pFrame,
            /* [in] */ IOleInPlaceUIWindow *pDoc);
        STDMETHODIMP HideUI( void);
        STDMETHODIMP UpdateUI( void);
        STDMETHODIMP OnDocWindowActivate( 
            /* [in] */ BOOL fActivate);
        STDMETHODIMP OnFrameWindowActivate( 
            /* [in] */ BOOL fActivate);
        STDMETHODIMP ResizeBorder( 
            /* [in] */ LPCRECT prcBorder,
            /* [in] */ IOleInPlaceUIWindow *pUIWindow,
            /* [in] */ BOOL fRameWindow);
        STDMETHODIMP TranslateAccelerator( 
            /* [in] */ LPMSG lpMsg,
            /* [in] */ const GUID *pguidCmdGroup,
            /* [in] */ DWORD nCmdID);
        STDMETHODIMP GetOptionKeyPath( 
            /* [out] */ LPOLESTR *pchKey,
            /* [in] */ DWORD dw);
        STDMETHODIMP GetDropTarget( 
            /* [in] */ IDropTarget *pDropTarget,
            /* [out] */ IDropTarget **ppDropTarget);
        STDMETHODIMP GetExternal( 
            /* [out] */ IDispatch **ppDispatch);
        STDMETHODIMP TranslateUrl( 
            /* [in] */ DWORD dwTranslate,
            /* [in] */ OLECHAR *pchURLIn,
            /* [out] */ OLECHAR **ppchURLOut);
        STDMETHODIMP FilterDataObject( 
            /* [in] */ IDataObject *pDO,
            /* [out] */ IDataObject **ppDORet);
 		// IAdviseSink methods
 		STDMETHODIMP_(void) OnDataChange(FORMATETC *pFormatEtc,STGMEDIUM *pStgmed);
@@ -151,13 +90,14 @@ class AXClientSite :
 	   STDMETHODIMP EnableModeless(BOOL f);
 	   STDMETHODIMP TranslateAccelerator(LPMSG,WORD);
-	   std::wstring m_lastExternalName;
+	
 	   // IDispatch Methods
 	   HRESULT _stdcall GetTypeInfoCount(unsigned int * pctinfo);
 	   HRESULT _stdcall GetTypeInfo(unsigned int iTInfo,LCID lcid,ITypeInfo FAR* FAR* ppTInfo);
 		HRESULT _stdcall GetIDsOfNames(REFIID riid,OLECHAR FAR* FAR*,unsigned int cNames,LCID lcid,DISPID FAR* );
 		HRESULT _stdcall Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS FAR* pDispParams,VARIANT FAR* pVarResult,EXCEPINFO FAR* pExcepInfo,unsigned int FAR* puArgErr);
 		// IOleControlSite Methods
   };
@@ -187,9 +127,13 @@ class AX
 	   //AX_CONNECTSTRUCT* tcs;
 	   bool AddMenu;
 	   DWORD AdviseToken;
-		DWORD DAdviseToken[100];	
+		DWORD DAdviseToken[100];
 	private:
 		CLSID clsid;
--- a/content/font/comics-small.fnt
+++ b/content/font/comics-small.fnt
--- a/content/font/comics.fnt
+++ b/content/font/comics.fnt
--- a/content/images/ArrowFarCursor.png
+++ b/content/images/ArrowFarCursor.png
--- a/content/images/BumpTool.png
+++ b/content/images/BumpTool.png
--- a/content/images/BumpTool_dn.png
+++ b/content/images/BumpTool_dn.png
--- a/content/images/Clone.png
+++ b/content/images/Clone.png
--- a/content/images/GameTool.png
+++ b/content/images/GameTool.png
--- a/content/images/GlueTool.png
+++ b/content/images/GlueTool.png
--- a/content/images/GlueTool_dn.png
+++ b/content/images/GlueTool_dn.png
--- a/content/images/Grab.png
+++ b/content/images/Grab.png
--- a/content/images/Hammer.png
+++ b/content/images/Hammer.png
--- a/content/images/Laser.png
+++ b/content/images/Laser.png
--- a/content/images/RightMotorFastTool.png
+++ b/content/images/RightMotorFastTool.png
--- a/content/images/RightMotorFastTool_dn.png
+++ b/content/images/RightMotorFastTool_dn.png
--- a/content/images/RightMotorTool.png
+++ b/content/images/RightMotorTool.png
--- a/content/images/RightMotorTool_dn.png
+++ b/content/images/RightMotorTool_dn.png
--- a/content/images/Rocket.png
+++ b/content/images/Rocket.png
--- a/content/images/Slingshot.png
+++ b/content/images/Slingshot.png
--- a/content/images/SmoothTool.png
+++ b/content/images/SmoothTool.png
--- a/content/images/SmoothTool_dn.png
+++ b/content/images/SmoothTool_dn.png
--- a/content/page/color.html
+++ b/content/page/color.html
@@ -1,122 +0,0 @@
 <html>
 <script>
 </script>
 <style>
 	img{
 		height: 100%;
 	}
 	.container
 	{
 		height: 47px;
 		width: 50px;
 		margin-right: 10px;	
 	}
 	.color
 	{
 		border-style: inset;
 		border-width: 2px;
 		width:16px;
 		height:16px;
 		font-size: 0;
 		display:inline-block;
 		*display:inline; 
 		*zoom:1;
 	}
 	#currentcolor
 	{
 		width; 80%;
 		height: 80%;
 		border-style: inset;
 		border-width: 2px;
 	}
 	.colorPicker
 	{
 		width: 32px;
 		height: 32px;
 	}
 </style>
 <script>
 	var currentcolor = "white"; //This will be queried from the application later
 	function setColor(btn)
 	{
 		var color = btn.style.backgroundColor;
 		var clInt = parseInt(color.replace("#","0x"));
 		document.getElementById("currentcolor").style.backgroundColor = color;
 		window.external.SetColor(clInt);
 	}
 	 function decimalColorToHTMLcolor(number) {
 		//Found at https://bytes.com/topic/javascript/insights/636088-function-convert-decimal-color-number-into-html-hex-color-string
 		var intnumber = number - 0;
 		var red, green, blue;
 		var template = "#000000";
 		red = (intnumber&0x0000ff) << 16;
 		green = intnumber&0x00ff00;
 		blue = (intnumber&0xff0000) >>> 16;
 		intnumber = red|green|blue;
 		var HTMLcolor = intnumber.toString(16);
 		HTMLcolor = template.substring(0,7 - HTMLcolor.length) + HTMLcolor;
 		return HTMLcolor;
 	} 
 	function hex2decInt(hex)
 	{
 		return parseInt(hex, 16);
 	}
 	function queryColor()
 	{
 		var color = window.external.ChooseColor();
 		if(color != null)
 		{
 			color = decimalColorToHTMLcolor(color);
 			document.getElementById("currentcolor").style.backgroundColor = color;
 		}
 	}
 </script>
 <body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
 <table height="100%">
 	<tr>
 		<th>
 			<div class="color" onclick="setColor(this)" style="background-color: #000000"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #808080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #800000"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #808000"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #008000"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #008080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #000080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #800080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #808040"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #004040"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #0080FF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #004080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #8000FF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #804000"></div><br>
 			<div class="color" onclick="setColor(this)" style="background-color: #FFFFFF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #C0C0C0"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FF0000"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FFFF00"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #00FF00"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #00FFFF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #0000FF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FF00FF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FFFF80"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #00FF80"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #80FFFF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #8080FF"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FF0080"></div>
 			<div class="color" onclick="setColor(this)" style="background-color: #FF8040"></div>
 		</th>
 		<td>
 			<button onclick="queryColor();" class='colorPicker'>
 				<div id='currentcolor' style="background-color:white;">
 			</button>
 		</td>
 	</tr>
 </table>
 </body>
 </html>
--- a/content/page/controller.html
+++ b/content/page/controller.html
@@ -1,21 +0,0 @@
 <html>
 <script>
 	function toolOvr(image)
 	{
 		if(image.src.indexOf("_dn.png") == -1)
 			image.src = image.src.replace(".png", "_dn.png");
 	}
 	function toolOut(image)
 	{
 		if(image.src.indexOf("_dn.png") != -1)
 			image.src = image.src.replace("_dn.png",".png");
 	}
 </script>
 <body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
 	<img src="../images/Controller1Tool.png" onclick="window.external.SetController(1)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/Controller2Tool.png" onclick="window.external.SetController(2)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/ControllerAI1Tool.png" onclick="window.external.SetController(5)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/ControllerAI2Tool.png" onclick="window.external.SetController(6)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/ControllerNoneTool.png" onclick="window.external.SetController(0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 </body>
 </html>
--- a/content/page/hopper.html
+++ b/content/page/hopper.html
@@ -1,47 +0,0 @@
 <html>
 <script>
 	function toolOvr(image)
 	{
 		image.style.backgroundColor = "#cccccc";
 	}
 	function toolOut(image)
 	{
 		image.style.backgroundColor = "transparent";
 	}
 </script>
 <style>
 	img{
 		height: 100%;
 	}
 	.container
 	{
 		height: 47px;
 		width: 50px;
 		margin-right: 10px;
 	}
 </style>
 <body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="alert(window.external.ToggleHopperBin(0))">
 		<img src="../images/GameTool.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(1)">
 		<img src="../images/Grab.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(2)">
 		<img src="../images/Clone.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(3)">
 		<img src="../images/Hammer.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(4)">
 		<img src="../images/Slingshot.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(5)">
 		<img src="../images/Rocket.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(6)">
 		<img src="../images/Laser.png" />
 	</span>
 </body>
 </html>
--- a/content/page/surface.html
+++ b/content/page/surface.html
@@ -1,23 +0,0 @@
 <html>
 <script>
 	function toolOvr(image)
 	{
 		if(image.src.indexOf("_dn.png") == -1)
 			image.src = image.src.replace(".png", "_dn.png");
 	}
 	function toolOut(image)
 	{
 		if(image.src.indexOf("_dn.png") != -1)
 			image.src = image.src.replace("_dn.png",".png");
 	}
 </script>
 <body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
 	<img src="../images/FlatTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(0, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/BumpTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(1, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/HingeTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(2, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/LeftMotorTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 1)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/LeftMotorFastTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 2)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/RightMotorTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 3)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 	<img src="../images/RightMotorFastTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 4)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
 </body>
 </html>
--- a/icon1.ico
+++ b/icon1.ico
--- a/main.cpp
+++ b/main.cpp
--- a/src/source/propertyGrid.cpp
+++ b/src/source/propertyGrid.cpp
@@ -10,12 +10,12 @@
 ///         This source is distributed in the hope that it will be useful,
 ///         but WITHOUT ANY WARRANTY; without even the implied warranty of
 ///         MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-///
+/// 
 /// @date 2-27-16
 /// 
 /// @todo 
 ///
-/// @todo
+/// @bug 
 ///
 /// @bug
 ///
 //////////////////////////////////////////////////////////////////////////////
@@ -29,14 +29,14 @@
 //DWM 1.8: Version 1.8 changes labelled thus.
 //DWM 1.9: Version 1.9 changes labelled thus.
-//DWM 1.9: Suppress POCC Warning "Argument x to 'sscanf' does not match the format string;
+//DWM 1.9: Suppress POCC Warning "Argument x to 'sscanf' does not match the format string; 
 //          expected 'unsigned char *' but found 'unsigned long'"
 #ifdef __POCC__
 #pragma warn(disable:2234)
 #endif
 #ifndef _WIN32_WINNT // Necessary for WM_MOUSEWHEEL support
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0500
 #endif
 // MSVC++ Support
@@ -70,7 +70,7 @@
 #define _tmemset  wmemset
 #define _stprintf  swprintf
 #else
-#define _tmemcpy  memcpy_s
+#define _tmemcpy  memcpy
 #define _tmemmove  memmove
 #define _tmemset  memset
 #define _stprintf  _snprintf
@@ -103,7 +103,7 @@
 //DWM 1.2: Converted the following 4 items to constants
 #define SELECT _T("T")         ///< PIT_CHECK select
 #define UNSELECT _T("F")       ///< PIT_CHECK unselect
-#define CHECKED SELECT         ///< PIT_CHECK checked
+#define CHECKED SELECT         ///< PIT_CHECK checked 
 #define UNCHECKED UNSELECT     ///< PIT_CHECK unchecked
 //DWM 1.3: Added
@@ -142,7 +142,7 @@
 ///         in a list box.
 ///
 /// @param hwndCtl The handle of a listbox.
-/// @param xPos The x coordinate of a point.
+/// @param xPos The x coordinate of a point. 
 /// @param yPos The y coordinate of a point.
 ///
 /// @returns The return value contains the index of the nearest item
@@ -290,7 +290,7 @@ static LPINSTANCEDATA g_lpInst; ///< instance data (this) pointer
 /// @brief Get the Instance data associated with this instance.
 ///
 /// @param hControl Handle to Current instance.
-/// @param ppInstanceData - Pointer to the address of an INSTANCEDATA struct.
+/// @param ppInstanceData - Pointer to the address of an INSTANCEDATA struct. 
 ///
 /// @returns TRUE if successful
 static BOOL Control_GetInstanceData(HWND hControl, LPINSTANCEDATA * ppInstanceData)
@@ -362,7 +362,7 @@ static LPTSTR NewString(LPTSTR str)
    if(NULL == tmp)
    {
-        return (LPTSTR)calloc(1, sizeof(TCHAR));
+        return (LPTSTR)calloc(1, sizeof(TCHAR)); 
    }
    return (LPTSTR)_tmemmove(tmp, str, _tcslen(str));
 }
@@ -386,7 +386,7 @@ static LPTSTR NewStringArray(LPTSTR szzStr)
    if(NULL == tmp)
    {
-        return (LPTSTR)calloc(1, sizeof(TCHAR));
+        return (LPTSTR)calloc(1, sizeof(TCHAR)); 
    }
    return (LPTSTR)_tmemmove(tmp, szzStr, iLen);
 }
@@ -482,7 +482,7 @@ static VOID Editor_OnKillFocus(HWND hwnd, HWND hwndNewFocus)
    g_lpInst->fGotFocus =
        (NULL != hwndNewFocus &&
        (g_lpInst->hwndListBox  == hwndNewFocus ||
-         g_lpInst->hwndCtl1     == hwndNewFocus ||
+         g_lpInst->hwndCtl1     == hwndNewFocus || 
         g_lpInst->hwndCtl2     == hwndNewFocus ||
         g_lpInst->hwndPropDesc == hwndNewFocus ||
         g_lpInst->hwndToolTip  == hwndNewFocus));
@@ -653,7 +653,7 @@ static BOOL Editor_OnPaint(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
    rect.left += 1;
    rect.bottom += 1;
    rect.right += 1;
-
+    
    DrawBorder(hdc, &rect, BF_RECT, GetSysColor(COLOR_WINDOW));
    ReleaseDC(hwnd, hdc);
@@ -959,7 +959,7 @@ static HWND CreateEdit(HINSTANCE hInstance, HWND hwndParent, INT id)
        return NULL;
    //DWM 1.4: Added Disable visual styles for this control.
-   // SetWindowTheme(hwnd, L" ", L" ");
+    SetWindowTheme(hwnd, L" ", L" ");
    SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
@@ -1149,7 +1149,7 @@ static HWND CreateIpEdit(HINSTANCE hInstance, HWND hwndParent, INT id, LPRECT lp
        NULL,
        dwStyle,
        CW_USEDEFAULT, // x position can be changed after creation
-        CW_USEDEFAULT, // y position can be changed after creation
+        CW_USEDEFAULT, // y position can be changed after creation 
        lprc->right - lprc->left, // width can only be set here
        lprc->bottom - lprc->top, // height can only be set here
        hwndParent, (HMENU)id, hInstance, NULL);
@@ -1268,7 +1268,7 @@ static HWND CreateButton(HINSTANCE hInstance, HWND hwndParent, INT id)
        return NULL;
    //DWM 1.4: Added Disable visual styles for this control.
-    //SetWindowTheme(hwnd, L" ", L" ");
+    SetWindowTheme(hwnd, L" ", L" ");
    SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
@@ -1505,7 +1505,7 @@ static HWND CreateDatePicker(HINSTANCE hInstance, HWND hwndParent, INT id, BOOL
        return NULL;
    //DWM 1.4: Added Disable visual styles for this control.
-    //SetWindowTheme(hwnd, L" ", L" ");
+    SetWindowTheme(hwnd, L" ", L" ");
    SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
@@ -1697,7 +1697,7 @@ static HWND CreateCombo(HINSTANCE hInstance, HWND hwndParent, INT id, BOOL fEdit
    //DWM 1.4: Disable visual styles for the time being since the combo looks bad
    // in this grid when drawn using the Vista and later styles.
-    //SetWindowTheme(hwnd, L" ", L" ");
+    SetWindowTheme(hwnd, L" ", L" ");
    SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
@@ -3272,7 +3272,7 @@ static HBRUSH Grid_OnCtlColorStatic(HWND hwnd, HDC hdc, HWND hwndChild, INT type
        FillSolidRect(hdc,MAKE_PRECT(0, g_lpInst->iVDivider - 2,
            WIDTH(rc), g_lpInst->iVDivider),GetSysColor(COLOR_BTNFACE));
        ReleaseDC(hwnd,hdc);
-    }
+    } 
    return FORWARD_WM_CTLCOLORSTATIC(hwnd, hdc, hwndChild, DefWindowProc);
 }
--- a/src/include/propertyGrid.h
+++ b/src/include/propertyGrid.h
--- a/src/include/rapidxml/license.txt
+++ b/src/include/rapidxml/license.txt
--- a/src/include/rapidxml/manual.html
+++ b/src/include/rapidxml/manual.html
--- a/src/include/rapidxml/rapidxml.hpp
+++ b/src/include/rapidxml/rapidxml.hpp
--- a/src/include/rapidxml/rapidxml_iterators.hpp
+++ b/src/include/rapidxml/rapidxml_iterators.hpp
--- a/src/include/rapidxml/rapidxml_print.hpp
+++ b/src/include/rapidxml/rapidxml_print.hpp
--- a/src/include/rapidxml/rapidxml_utils.hpp
+++ b/src/include/rapidxml/rapidxml_utils.hpp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DirtPiper	f42c5a4a08	Fixed level loading	2019-10-26 17:19:45 -04:00
DirtPiper	4a82c67fdc	Added getMass to part	2019-10-26 15:54:48 -04:00
`@@ -1,4 +1,4 @@`
	`#include "DataModel/WorkspaceInstance.h"`	`#include "WorkspaceInstance.h"`


	`WorkspaceInstance::WorkspaceInstance(void)`	`WorkspaceInstance::WorkspaceInstance(void)`