diff --git a/Application.cpp b/Application.cpp
new file mode 100644
index 0000000..ad4c89e
--- /dev/null
+++ b/Application.cpp
@@ -0,0 +1,1353 @@
+#include <G3DAll.h>
+#include <initguid.h>
+#include <iomanip>
+#include "Instance.h"
+#include "resource.h"
+#include "PartInstance.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
+#include "DataModelInstance.h"
+#include "CameraController.h"
+#include "AudioPlayer.h"
+#include "Globals.h"
+#include "Application.h"
+#include "win32Defines.h"
+#include "WindowFunctions.h"
+#include <limits.h>
+#include <mshtml.h>
+#include <exdisp.h>
+#include <vector>
+#include <string>
+#include "ax.h"
+#include <cguid.h>
+#include "IEBrowser.h"
+#include "PropertyWindow.h"
+#include <commctrl.h>
+#include "StringFunctions.h"
+
+#include "GUDButtonListener.h"
+#include "ModeSelectionListener.h"
+#include "DeleteListener.h"
+#include "CameraButtonListener.h"
+#include "RotateButtonListener.h"
+
+Ray testRay;
+static int cursorid = 0;
+static int cursorOvrid = 0;
+static int currentcursorid = 0;
+static G3D::TextureRef cursor = NULL;
+static G3D::TextureRef cursorOvr = NULL;
+static bool mouseMovedBeginMotion = false;
+static POINT oldGlobalMouse;
+Vector2 oldMouse = Vector2(0,0);
+float moveRate = 0.5;
+
+void Application::clearInstances()
+{
+	delete _dataModel;
+}
+
+PartInstance* Application::makePart()
+{
+	PartInstance* part = new PartInstance();
+	return part;
+}
+
+TextButtonInstance* Application::makeTextButton()
+{
+	TextButtonInstance* part = new TextButtonInstance();
+	return part;
+}
+
+ImageButtonInstance* Application::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
+{
+	ImageButtonInstance* part = new ImageButtonInstance(newImage,overImage, downImage, disableImage);
+//	instances.push_back(part);
+//	instances_2D.push_back(part);
+	return part;
+}
+
+Application::Application(HWND parentWindow) : _message(""), _messageTime(0) { //: GApp(settings,window) {
+	
+	std::string tempPath = ((std::string)getenv("temp")) + "/"+g_PlaceholderName;
+	CreateDirectory(tempPath.c_str(), NULL);
+	
+	_message = tempPath;
+	_messageTime = System::time();
+	_hWndMain = parentWindow;
+
+	HMODULE hThisInstance = GetModuleHandle(NULL);
+
+	_hwndToolbox = CreateWindowEx(
+		WS_EX_ACCEPTFILES,
+		"AX",
+		"{8856F961-340A-11D0-A96B-00C04FD705A2}",
+		WS_CHILD | WS_VISIBLE,
+		0,
+		560,
+		800,
+		60,
+		_hWndMain, // parent
+		NULL, // menu
+		hThisInstance,
+		NULL
+	);
+	
+	_hwndRenderer = CreateWindowEx(
+		WS_EX_ACCEPTFILES,
+		"G3DWindow",
+		"3D",
+		WS_CHILD,
+		CW_USEDEFAULT,
+		CW_USEDEFAULT,
+		1,
+		1,
+		_hWndMain, // parent
+		NULL, // menu
+		hThisInstance,
+		NULL
+	);
+	_settings.window.resizable = true;
+	_settings.writeLicenseFile = false;
+	_settings.logFilename = tempPath + "/g3dlog.txt";
+	_settings.window.center = true; 
+	Win32Window* window = Win32Window::create(_settings.window,_hwndRenderer);
+	ShowWindow(_hwndRenderer, SW_SHOW);
+	ShowWindow(_hWndMain, SW_SHOW);
+
+	quit=false;
+	rightButtonHolding=false;
+	mouseOnScreen=false;
+	// GApp replacement
+	renderDevice = new RenderDevice();
+	if (window != NULL) {
+	renderDevice->init(window, NULL);
+	}
+	else
+	{
+		MessageBox(NULL,"Window not found!","Error",MB_OK | MB_ICONSTOP);
+		return;
+	}
+
+    _window = renderDevice->window();
+    _window->makeCurrent();
+	
+	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
+	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
+	_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
+	IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
+	//webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/");
+}
+
+
+void Application::deleteInstance()
+{
+	if(g_selectedInstances.size() > 0)
+	{
+		size_t undeletable = 0;
+		while(g_selectedInstances.size() > undeletable)
+		{
+			if(g_selectedInstances.at(0)->canDelete)
+			{
+				AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
+				Instance* selectedInstance = g_selectedInstances.at(0);
+				if(selectedInstance->getParent() != NULL)
+					selectedInstance->getParent()->removeChild(selectedInstance);
+				delete selectedInstance;
+				selectedInstance = NULL;
+				g_selectedInstances.erase(g_selectedInstances.begin());
+			}
+			else
+			{
+				undeletable++;
+			}
+		}
+	}
+	if(g_selectedInstances.size() == 0)
+		g_usableApp->_propWindow->ClearProperties();
+}
+
+void Application::initGUI()
+{
+	TextButtonInstance* button = makeTextButton();
+	button->boxBegin = Vector2(0, -24);
+	button->boxEnd = Vector2(80, 0);
+	button->floatBottom = true;
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Hopper";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+	
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -48);
+	button->boxEnd = Vector2(80, -24);
+	button->floatBottom = true;
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Controller";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -72);
+	button->boxEnd = Vector2(80, -48);
+	button->floatBottom = true;
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Color";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -96);
+	button->boxEnd = Vector2(80, -72);
+	button->floatBottom = true;
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Surface";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -120);
+	button->boxEnd = Vector2(80, -96);
+	button->floatBottom = true;
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->boxOutlineColor = Color3(0,255,255);
+	button->title = "Model";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, 0);
+	button->boxEnd = Vector2(125, 25);
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "File";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(125, 0);
+	button->boxEnd = Vector2(250, 25);
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Edit";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(250, 0);
+	button->boxEnd = Vector2(375, 25);
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "View";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(375, 0);
+	button->boxEnd = Vector2(500, 25);
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Insert";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(500, 0);
+	button->boxEnd = Vector2(625, 25);
+	button->setParent(_dataModel->getGuiRoot());
+	button->font = fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Format";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,215);
+	button->boxEnd = Vector2(80,235);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "Group";
+	button->name = "Group";
+	button->setAllColorsSame();	
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(_dataModel->getGuiRoot());
+
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,240);
+	button->boxEnd = Vector2(80,260);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "UnGroup";
+	button->name = "UnGroup";
+	button->setAllColorsSame();
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(_dataModel->getGuiRoot());
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,265);
+	button->boxEnd = Vector2(80,285);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "Duplicate";
+	button->setAllColorsSame();
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(_dataModel->getGuiRoot());
+	button->name = "Duplicate";
+	button->setButtonListener(new GUDButtonListener());
+
+	ImageButtonInstance* instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/Run.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")));
+	instance->name = "go";
+	instance->size = Vector2(65,65);
+	instance->position = Vector2(6.5, 25);
+	instance->setParent(_dataModel->getGuiRoot());
+
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ds.png")));
+	instance->size = Vector2(50,50);
+	instance->position = Vector2(15, 90);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Cursor";
+	instance->setButtonListener(new ModeSelectionListener());
+
+	instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
+	instance->size = Vector2(40,40);
+	instance->position = Vector2(0, 140);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Resize";
+	instance->setButtonListener(new ModeSelectionListener());
+	
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ds.png")));
+	instance->size = Vector2(40,40);
+	instance->position = Vector2(40, 140);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Arrows";
+	instance->setButtonListener(new ModeSelectionListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")),
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ovr.png")),
+		NULL,
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ds.png")));
+	instance->size = Vector2(30,30);
+	instance->position = Vector2(10, 175);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Rotate";
+	instance->setButtonListener(new RotateButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")),
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ovr.png")),
+		NULL,
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ds.png")));
+	instance->size = Vector2(30,30);
+	instance->position = Vector2(40, 175);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Tilt";
+	instance->setButtonListener(new RotateButtonListener());
+
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/Delete.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_ds.png")));
+	instance->size = Vector2(40,46);
+	instance->position = Vector2(20, 284);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "Delete";
+	instance->setButtonListener(new DeleteListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_dn.png")));
+	instance->size = Vector2(34,25);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -90);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "ZoomIn";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_dn.png")));
+	instance->size = Vector2(34,26);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -31);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "ZoomOut";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_dn.png")));
+	instance->size = Vector2(34,34);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-110, -50);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "PanLeft";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_dn.png")));
+	instance->size = Vector2(34,34);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-45, -50);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "PanRight";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_dn.png")));
+	instance->size = Vector2(34,20);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -60);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "CenterCam";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_dn.png")));
+	instance->size = Vector2(24,24);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-105, -75);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "TiltUp";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_dn.png")));
+	instance->size = Vector2(24,24);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-40, -75);
+	instance->setParent(_dataModel->getGuiRoot());
+	instance->name = "TiltDown";
+	instance->setButtonListener(new CameraButtonListener());
+}
+
+
+void Application::onInit()  {
+	
+    // Called before Application::run() beings
+	cameraController.setFrame(Vector3(0,2,10));
+	_dataModel = new DataModelInstance();
+	_dataModel->setParent(NULL);
+	_dataModel->name = "undefined";
+	_dataModel->font = fntdominant;
+	g_dataModel = _dataModel;
+	
+	initGUI();
+
+#ifdef LEGACY_LOAD_G3DFUN_LEVEL
+	PartInstance* test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(0.2F,0.3F,1);
+	test->setSize(Vector3(24,1,24));
+	test->setPosition(Vector3(0,0,0));
+	test->setCFrame(test->getCFrame() * Matrix3::fromEulerAnglesXYZ(0,toRadians(0),toRadians(0)));
+	
+
+	
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(.5F,1,.5F);
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-10,1,0));
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(.5F,1,.5F);
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(10,1,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(7,2,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-7,2,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(4,3,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-5,3,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(1,4,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-3,4,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-2,5,0));
+	
+
+	
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(0,6,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(2,7,0));
+#else
+	_dataModel->debugGetOpen();
+#endif
+	
+
+
+
+	//setDesiredFrameRate(60);
+	
+	
+	
+
+    //GApplet::onInit();
+	
+}
+
+
+
+
+
+
+void Application::onCleanup() {
+    clearInstances();
+	sky->~Sky();
+}
+
+
+
+
+void Application::onLogic() {
+    // Add non-simulation game logic and AI code here
+
+		
+
+
+}
+
+
+void Application::onNetwork() {
+	// Poll net messages here
+}
+
+
+//double getVectorDistance(Vector3 vector1, Vector3 vector2)
+//{
+//	return pow(pow((double)vector1.x - (double)vector2.x, 2) + pow((double)vector1.y - (double)vector2.y, 2) + pow((double)vector1.z - (double)vector2.z, 2), 0.5);
+//}
+
+std::vector<Instance*> Application::getSelection()
+{
+	return g_selectedInstances;
+}
+void Application::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
+
+	
+		
+		Instance * obj6 = _dataModel->getGuiRoot()->findFirstChild("Delete");
+		Instance * obj = _dataModel->getGuiRoot()->findFirstChild("Duplicate");
+		Instance * obj2 = _dataModel->getGuiRoot()->findFirstChild("Group");
+		Instance * obj3 = _dataModel->getGuiRoot()->findFirstChild("UnGroup");
+		Instance * obj4 = _dataModel->getGuiRoot()->findFirstChild("Rotate");
+		Instance * obj5 = _dataModel->getGuiRoot()->findFirstChild("Tilt");
+		if(obj != NULL && obj2 != NULL && obj3 != NULL && obj4 !=NULL && obj5 != NULL && obj6 != NULL)
+		{
+			BaseButtonInstance* button = (BaseButtonInstance*)obj;
+			BaseButtonInstance* button2 = (BaseButtonInstance*)obj2;
+			BaseButtonInstance* button3 = (BaseButtonInstance*)obj3;
+			BaseButtonInstance* button4 = (BaseButtonInstance*)obj4;
+			BaseButtonInstance* button5 = (BaseButtonInstance*)obj5;
+			BaseButtonInstance* button6 = (BaseButtonInstance*)obj6;
+			button->disabled = true;
+			button2->disabled = true;
+			button3->disabled = true;
+			button4->disabled = true;
+			button5->disabled = true;
+			button6->disabled = true;
+			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+				if(g_selectedInstances.at(i)->canDelete)
+				{
+					button->disabled = false;
+					button2->disabled = false;
+					button3->disabled = false;
+					button4->disabled = false;
+					button5->disabled = false;
+					button6->disabled = false;
+					break;
+				}
+		}
+
+
+	if(_dataModel->name != _title)
+	{
+		_title = _dataModel->name;
+		std::string text = "Game \"" + _title + "\"";
+		SetWindowText(_hWndMain, text.c_str());
+		
+	}
+
+	cameraController.update(this);
+
+}
+
+/*double getOSVersion() {
+    OSVERSIONINFO osvi;
+
+    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+
+    GetVersionEx(&osvi);
+	std::string version = Convert(osvi.dwMajorVersion) + "." + Convert(osvi.dwMinorVersion);
+	return ::atof(version.c_str());
+}*/
+/* 
+bool IsHolding(int button)
+{
+	return (GetKeyState(button) >> 1)>0;
+}
+
+*/
+
+void Application::onUserInput(UserInput* ui) {
+	
+	/*
+	if(GetHoldKeyState(VK_LCONTROL))
+	{
+		if(GetHoldKeyState('D'))
+		{
+			_messageTime = System::time();
+			if(debugMode())
+				_message = "Debug Mode Disabled";
+			else
+				_message = "Debug Mode Enabled";
+			setDebugMode(!debugMode());
+		}
+	}
+	*/
+	if(GetHoldKeyState(VK_F8))
+	{
+		_messageTime = System::time();
+		_message = "FOV Set to 10";
+		
+	}
+	//}
+
+	//_dataModel->mousex = ui->getMouseX();
+	//_dataModel->mousey = ui->getMouseY();
+	_dataModel->mouseButton1Down = (GetKeyState(VK_LBUTTON) & 0x100) != 0;
+
+	if (GetHoldKeyState(VK_LBUTTON)) {
+		if (_dragging) {
+			PartInstance* part = NULL;
+			if(g_selectedInstances.size() > 0)
+				part = (PartInstance*) g_selectedInstances.at(0);
+		Ray dragRay = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport());
+		std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+		for(size_t i = 0; i < instances.size(); i++)
+			{
+				if(PartInstance* moveTo = dynamic_cast<PartInstance*>(instances.at(i)))
+				{
+					float __time = testRay.intersectionTime(moveTo->getBox());
+					float __nearest=std::numeric_limits<float>::infinity();
+					if (__time != inf()) 
+					{
+						if (__nearest>__time)
+						{
+							// BROKEN
+							//Vector3 closest = (dragRay.closestPoint(moveTo->getPosition()) * 2);
+							//part->setPosition(closest);
+							//part->setPosition(Vector3(floor(closest.x),part->getPosition().y,floor(closest.z)));
+						}
+					}
+				}
+			}
+			Sleep(10);
+		}
+	}
+	// Camera KB Handling {
+		if (GetKPBool(VK_OEM_COMMA)) //Left
+			g_usableApp->cameraController.panLeft();
+		else if (GetKPBool(VK_OEM_PERIOD)) // Right
+			g_usableApp->cameraController.panRight();
+		else if (GetKPBool(0x49)) // Zoom In (I)
+			g_usableApp->cameraController.Zoom(1);
+		else if (GetKPBool(0x4F)) // Zoom Out (O)
+			g_usableApp->cameraController.Zoom(-1);
+	// }
+
+	//readMouseGUIInput();
+	// Add other key handling here
+}
+
+void Application::makeFlag(Vector3 &vec, RenderDevice* &rd)
+{
+
+	Vector3 up = Vector3(vec.x, vec.y+3, vec.z);
+	rd->setColor(Color3::blue());
+	rd->beforePrimitive();
+
+		glBegin(GL_LINES);
+		glVertex3f(vec.x, vec.y, vec.z);
+		glVertex3f(up.x, up.y, up.z);
+		glEnd();
+
+		glBegin( GL_TRIANGLES );
+		glVertex3f(up.x, up.y-1, up.z);
+		glVertex3f(up.x, up.y-0.5, up.z-1);
+		glVertex3f(up.x, up.y, up.z);
+		
+		glVertex3f(up.x, up.y, up.z);
+		glVertex3f(up.x, up.y-0.5, up.z-1);
+		glVertex3f(up.x, up.y-1, up.z);
+
+		glEnd();
+	rd->afterPrimitive();
+	rd->setColor(Color3::white());
+	//I know how i will approach this now
+}
+
+int Application::getMode()
+{
+	return _mode;
+}
+
+void Application::drawButtons(RenderDevice* rd)
+{
+	rd->pushState();
+	rd->beforePrimitive();
+			_dataModel->getGuiRoot()->render(rd);
+	rd->afterPrimitive();
+	rd->popState();
+}
+
+void Application::drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c)
+{
+
+	Color3 outline = Color3::cyan();//Color3(0.098F,0.6F,1.0F);
+	float offsetSize = 0.05F;
+	//X
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	//Y
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
+
+	//Z
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	
+	if(_mode == ARROWS)
+	{
+		rd->setLight(0, NULL);
+		rd->setAmbientLightColor(Color3(1,1,1));
+		
+		AABox box;
+		c.toWorldSpace(Box(from, to)).getBounds(box);
+		float max = box.high().y - pos.y;
+
+		Draw::arrow(pos, Vector3(0, 1.5+max, 0), rd);
+		Draw::arrow(pos, Vector3(0, (-1.5)-max, 0), rd);
+		
+		max = box.high().x - pos.x;
+
+		Draw::arrow(pos, Vector3(1.5+max, 0, 0), rd);
+		Draw::arrow(pos, Vector3((-1.5)-max, 0, 0), rd);
+
+		max = box.high().z - pos.z;
+
+		Draw::arrow(pos, Vector3(0, 0, 1.5+max), rd);
+		Draw::arrow(pos, Vector3(0, 0, (-1.5)-max), rd);
+
+
+
+		rd->setAmbientLightColor(lighting.ambient);
+		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	}
+	else if(_mode == RESIZE)
+	{
+		Color3 sphereColor = outline;
+		rd->setLight(0, NULL);
+		rd->setAmbientLightColor(Color3(1,1,1));
+		Vector3 gamepoint = pos;
+		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 < 200)
+		{
+			
+			float multiplier = distance * 0.025F/2;
+			if(multiplier < 0.25F)
+				multiplier = 0.25F;
+			Vector3 position = pos + (c.lookVector()*((size.z/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.lookVector()*((size.z/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+
+			position = pos + (c.rightVector()*((size.x/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.rightVector()*((size.x/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+
+			position = pos + (c.upVector()*((size.y/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.upVector()*((size.y/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+		}
+		rd->setAmbientLightColor(lighting.ambient);
+		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	}
+	
+}
+
+void Application::exitApplication()
+{
+	//endApplet = true;
+    //endProgram = true;
+}
+
+
+void Application::onGraphics(RenderDevice* rd) {
+	
+	G3D::uint8 num = 0;
+	POINT mousepos;
+	mouseOnScreen = true;
+	if (GetCursorPos(&mousepos))
+	{
+		POINT pointm = mousepos;
+	if (ScreenToClient(_hWndMain, &mousepos))
+	{
+		//mouseOnScreen = true;
+		//POINT pointm;
+		///GetCursorPos(&pointm);
+		if(_hwndRenderer != WindowFromPoint(pointm)) //OLD: mousepos.x < 1 || mousepos.y < 1 || mousepos.x >= rd->getViewport().width()-1 || mousepos.y >= rd->getViewport().height()-1
+		{
+			mouseOnScreen = false;
+			//ShowCursor(true);
+			_window->setMouseVisible(true);
+			//rd->window()->setInputCaptureCount(0);
+		}
+		else
+		{
+			mouseOnScreen = true;
+			//SetCursor(NULL);
+			_window->setMouseVisible(false);
+			//rd->window()->setInputCaptureCount(1);
+		}
+		
+	}
+	}
+	
+	if(Globals::useMousePoint)
+	{
+		mousepos = Globals::mousepoint;
+		ScreenToClient(_hWndMain, &mousepos);
+	}
+	
+    LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM));
+    renderDevice->setProjectionAndCameraMatrix(*cameraController.getCamera());
+	
+    // Cyan background
+    //renderDevice->setColorClearValue(Color3(0.0f, 0.5f, 1.0f));
+
+    renderDevice->clear(sky.isNull(), true, true);
+    if (sky.notNull()) {
+        sky->render(renderDevice, lighting);
+    }
+	
+    // Setup lighting
+    renderDevice->enableLighting();
+
+	renderDevice->setShadeMode(RenderDevice::SHADE_SMOOTH);
+	renderDevice->setAmbientLightColor(Color3(1,1,1));
+
+	renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	renderDevice->setAmbientLightColor(lighting.ambient);
+	
+	rd->beforePrimitive();
+	CoordinateFrame forDraw = rd->getObjectToWorldMatrix();
+	_dataModel->getWorkspace()->render(rd);
+	rd->setObjectToWorldMatrix(forDraw);
+	rd->afterPrimitive();
+
+	if(g_selectedInstances.size() > 0)
+	{
+		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		{
+			if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
+			{
+			Vector3 size = part->getSize();
+			Vector3 pos = part->getPosition();
+			drawOutline(Vector3(0+size.x/2, 0+size.y/2, 0+size.z/2) ,Vector3(0-size.x/2,0-size.y/2,0-size.z/2), rd, lighting, Vector3(size.x/2, size.y/2, size.z/2), Vector3(pos.x/2, pos.y/2, pos.z/2), part->getCFrameRenderBased());
+			}
+		}
+	}
+	
+
+	//Vector3 gamepoint = Vector3(0, 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 < 50 && distance > -50)
+	
+	//{
+	//	if(distance < 0)
+	//	distance = distance*-1;
+	//	fntdominant->draw3D(rd, "Testing", CoordinateFrame(rd->getCameraToWorldMatrix().rotation, gamepoint), 0.04*distance, Color3::yellow(), Color3::black(), G3D::GFont::XALIGN_CENTER, G3D::GFont::YALIGN_CENTER);
+	//}
+
+    renderDevice->disableLighting();
+
+    if (sky.notNull()) {
+        sky->renderLensFlare(renderDevice, lighting);
+    }
+	renderDevice->push2D();
+		if(System::time() - 3 < _messageTime)
+		{
+			fntdominant->draw2D(rd, _message, Vector2((rd->getWidth()/2)-(fntdominant->get2DStringBounds(_message, 20).x/2),(rd->getHeight()/2)-(fntdominant->get2DStringBounds(_message, 20).y/2)), 20, Color3::yellow(), Color3::black());
+		}
+
+		//TODO--Move these to their own instance
+
+		std::stringstream stream;
+		stream << std::fixed << std::setprecision(1) << _dataModel->getLevel()->timer;
+		fntdominant->draw2D(rd, "Timer: " + stream.str(), Vector2(rd->getWidth() - 120, 25), 20, Color3::fromARGB(0x81C518), Color3::black());
+		fntdominant->draw2D(rd, "Score: " + Convert(_dataModel->getLevel()->score), Vector2(rd->getWidth() - 120, 50), 20, Color3::fromARGB(0x81C518), Color3::black());
+		
+		//GUI Boxes	
+		Draw::box(G3D::Box(Vector3(0,25,0),Vector3(80,355,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
+		Draw::box(G3D::Box(Vector3(rd->getWidth() - 120,rd->getHeight() - 120,0),Vector3(rd->getWidth(),rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
+		
+		//Camera menu title
+		fntlighttrek->draw2D(rd, "CameraMenu", Vector2(rd->getWidth()-(fntlighttrek->get2DStringBounds("CameraMenu", 14).x+1),rd->getHeight() - 120), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
+
+		//Tools menu
+		Draw::box(G3D::Box(Vector3(5, 210,0),Vector3(75, 210,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0.6F,0.6F,0.6F,0.4F));
+		fntlighttrek->draw2D(rd,"MENU", Vector2(10,332), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
+
+		
+		drawButtons(rd);
+
+		_dataModel->drawMessage(rd);
+		rd->pushState();
+			rd->beforePrimitive();
+
+			if(Globals::showMouse && mouseOnScreen)
+			{
+			glEnable( GL_TEXTURE_2D );
+			glEnable(GL_BLEND);// you enable blending function
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+			
+			std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+			currentcursorid = cursorid;
+			for(size_t i = 0; i < instances.size(); i++)
+			{
+				if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
+				{
+					float time = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport()).intersectionTime(test->getBox());
+					//float time = testRay.intersectionTime(test->getBox());
+					if (time != inf()) 
+					{
+						currentcursorid = cursorOvrid;
+						break;
+					}
+					
+				}
+			}
+			
+			glBindTexture( GL_TEXTURE_2D, currentcursorid);
+
+			
+			glBegin( GL_QUADS );
+			glTexCoord2d(0.0,0.0);
+			glVertex2f(mousepos.x-64, mousepos.y-64);
+			glTexCoord2d( 1.0,0.0 );
+			glVertex2f(mousepos.x+64, mousepos.y-64);
+			glTexCoord2d(1.0,1.0 );
+			glVertex2f(mousepos.x+64, mousepos.y+64 );
+			glTexCoord2d( 0.0,1.0 );
+			glVertex2f( mousepos.x-64, mousepos.y+64 );
+			glEnd();
+
+			glDisable( GL_TEXTURE_2D );
+			}
+
+			rd->afterPrimitive();
+		rd->popState();
+	renderDevice->pop2D();
+}
+
+void Application::onKeyPressed(int key)
+{
+	if(key==VK_DELETE)
+	{
+		deleteInstance();
+	}
+	if (GetHoldKeyState(VK_RCONTROL))
+	{
+		if (key=='O')
+		{
+			_dataModel->getOpen();
+		}
+	}
+}
+void Application::onKeyUp(int key)
+{
+
+}
+
+void Application::onMouseLeftPressed(HWND hwnd,int x,int y)
+{
+	//Removed set focus 
+
+
+	std::cout << "Click: " << x << "," << y << std::endl;
+
+	bool onGUI = false;
+	std::vector<Instance*> instances_2D = _dataModel->getGuiRoot()->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+	{
+		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D.at(i)))
+		{
+			if(button->mouseInButton(x,y, renderDevice))
+			{
+				onGUI = true;
+				break;
+			}
+		}
+	}
+	if(!onGUI)
+	{
+		testRay = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport());
+		float nearest=std::numeric_limits<float>::infinity();
+		Vector3 camPos = cameraController.getCamera()->getCoordinateFrame().translation;
+		std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+        bool objFound = false;
+		for(size_t i = 0; i < instances.size(); i++)
+		{
+			if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
+			{
+				float time = testRay.intersectionTime(test->getBox());
+				
+				if (time != inf()) 
+				{
+					objFound = true;
+					if (nearest>time)
+					{
+						nearest=time;
+						bool found = false;
+						for(size_t i = 0; i < g_selectedInstances.size(); i++)
+						{
+							if(g_selectedInstances.at(i) == test)
+							{
+								found = true;
+								ShowWindow(_propWindow->_hwndProp, SW_SHOW);
+								SetActiveWindow(_propWindow->_hwndProp);
+								SetForegroundWindow(_propWindow->_hwndProp);
+								break;
+							}
+						}
+						if(!found)
+						{
+							g_selectedInstances.clear();
+							g_selectedInstances.push_back(test);
+						}
+						_propWindow->UpdateSelected(test);
+						//_message = "Dragging = true.";
+						//_messageTime = System::time();
+						//_dragging = true;
+					}
+				}
+			}		
+		}
+		if(!objFound)
+		{
+			g_selectedInstances.clear();
+			g_selectedInstances.push_back(_dataModel);
+			_propWindow->UpdateSelected(_dataModel);
+			
+		}
+	}
+}
+void Application::onMouseLeftUp(int x,int y)
+{
+	//std::cout << "Release: " << x << "," << y << std::endl;
+
+	_dragging = false;
+	//_message = "Dragging = false.";
+	//_messageTime = System::time();
+	std::vector<Instance*> instances_2D = _dataModel->getGuiRoot()->getAllChildren();
+	//std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+	{
+		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D[i]))
+		{
+			if(button->mouseInButton(x, y, renderDevice))
+			{
+				button->onMouseClick();
+			}
+		}
+	}
+}
+void Application::onMouseRightPressed(int x,int y)
+{
+}
+void Application::onMouseRightUp(int x,int y)
+{
+}
+void Application::onMouseMoved(int x,int y)
+{
+	oldMouse = _dataModel->getMousePos();
+	_dataModel->mousex = x;
+	_dataModel->mousey = y;
+
+}
+void Application::onMouseWheel(int x,int y,short delta)
+{
+	if (mouseOnScreen==true)
+	if (cameraController.onMouseWheel(x, y, delta))
+	{
+		AudioPlayer::playSound(cameraSound);
+	}
+}
+
+void Application::run() {
+	g_usableApp = this;
+	//setDebugMode(false);
+	//debugController.setActive(false);
+	/*
+	if (!createWindowClass("ToolWindowClass",ToolProc,GetModuleHandle(0)))
+	{
+		return;
+	}
+
+    HWND propertyHWnd = CreateWindowEx(
+    WS_EX_TOOLWINDOW,"ToolWindowClass", "ToolWindow",
+    WS_SYSMENU | WS_VISIBLE | WS_CHILD,
+	0, 0, 800, 64,
+    hWndMain, NULL, GetModuleHandle(0), NULL);
+
+	ShowWindow(propertyHWnd,SW_SHOW);
+	*/
+	UpdateWindow(_hWndMain);
+
+    // Load objects here=
+	cursor = Texture::fromFile(GetFileInPath("/content/images/ArrowCursor.png"));
+	cursorOvr = Texture::fromFile(GetFileInPath("/content/images/DragCursor.png"));
+	Globals::surface = Texture::fromFile(GetFileInPath("/content/images/surfacebr.png"));
+	Globals::surfaceId = Globals::surface->getOpenGLID();
+	fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt"));
+	fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt"));
+	cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav");
+	clickSound = GetFileInPath("/content/sounds/switch.wav");
+	dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav");
+    sky = Sky::create(NULL, ExePath() + "/content/sky/");
+	cursorid = cursor->openGLID();
+	currentcursorid = cursorid;
+	cursorOvrid = cursorOvr->openGLID();
+	RealTime	now=0, lastTime=0;
+	double		simTimeRate = 1.0f;
+	float		fps=30.0f;
+
+	RealTime	desiredFrameDuration=1.0/fps;
+	onInit();
+	RealTime    lastWaitTime=0;
+
+	MSG			messages;
+	//RECT cRect;
+	//GetClientRect(_hWndMain,&cRect);
+	//renderDevice->notifyResize(cRect.right,cRect.bottom);
+	//Rect2D viewportRect = Rect2D::xywh(0,0,cRect.right,cRect.bottom);
+	//renderDevice->setViewport(viewportRect);
+	//window()->setInputCaptureCount(1);
+	resizeWithParent(_hWndMain);
+
+	while (!quit)
+	{
+		
+		lastTime = now;
+		now = System::getTick();
+		RealTime timeStep = now - lastTime;
+		
+		m_userInputWatch.tick();
+			onUserInput(userInput);
+			//m_moduleManager->onUserInput(_userInput);
+		m_userInputWatch.tock();
+		
+		m_simulationWatch.tick();
+			//debugController.doSimulation(clamp(timeStep, 0.0, 0.1));
+			//g3dCamera.setCoordinateFrame
+				//(debugController.getCoordinateFrame());
+
+			double rate = simTimeRate;    
+			RealTime rdt = timeStep;
+			SimTime  sdt = timeStep * rate;
+			SimTime  idt = desiredFrameDuration * rate;
+
+			onSimulation(rdt,sdt,idt);
+		m_simulationWatch.tock();
+
+		m_waitWatch.tick();
+		{
+			RealTime now = System::time();
+			// Compute accumulated time
+			System::sleep(max(0.0, desiredFrameDuration - (now - lastWaitTime)));
+			lastWaitTime = System::time();
+		}
+		m_waitWatch.tock();
+
+		m_graphicsWatch.tick();
+			renderDevice->beginFrame();
+				renderDevice->pushState();
+					onGraphics(renderDevice);
+				renderDevice->popState();
+				//renderDebugInfo();
+			renderDevice->endFrame();
+			//debugText.clear();
+		m_graphicsWatch.tock();
+
+		while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
+		{
+			if (IsDialogMessage(_hWndMain, &messages) == 0)
+			{
+				TranslateMessage(&messages);
+				DispatchMessage(&messages);
+			}
+		}
+	}
+	onCleanup();
+}
+void Application::resizeWithParent(HWND parentWindow)
+{
+	RECT rect;
+	GetClientRect(parentWindow,&rect);
+	SetWindowPos(_hwndRenderer,NULL,0,0,rect.right,rect.bottom-60,SWP_NOMOVE);
+	SetWindowPos(_hwndToolbox,NULL,0,rect.bottom-60,rect.right,60,SWP_NOACTIVATE | SWP_SHOWWINDOW);
+	GetClientRect(_hwndRenderer,&rect);
+	int viewWidth=rect.right;
+	int viewHeight=rect.bottom;
+	renderDevice->notifyResize(viewWidth,viewHeight);
+	Rect2D viewportRect = Rect2D::xywh(0,0,viewWidth,viewHeight);
+	renderDevice->setViewport(viewportRect);
+
+}
+
+void Application::QuitApp()
+{
+	PostQuitMessage(0);
+	quit=true;
+}
+
+void Application::onCreate(HWND parentWindow)
+{
+	//SetWindowLongPtr(hwndRenderer,GWL_USERDATA,(LONG)this);
+	//SetWindowLongPtr(hwndToolbox,GWL_USERDATA,(LONG)this);
+	//SetWindowLongPtr(hwndMain,GWL_USERDATA,(LONG)&app);
+}
\ No newline at end of file
diff --git a/Application.h b/Application.h
new file mode 100644
index 0000000..abd1523
--- /dev/null
+++ b/Application.h
@@ -0,0 +1,81 @@
+#pragma once
+#include <G3DAll.h>
+#include "PropertyWindow.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
+#include "CameraController.h"
+
+class TextButtonInstance;
+class ImageButtonInstance;
+class PartInstance;
+class CameraController;
+
+class Application { // : public GApp {
+	public:
+		Application(HWND parentWindow);
+		void Boop();
+		virtual			~Application() {}
+		virtual void	exitApplication();
+		virtual void	onInit();
+		virtual void	onLogic();
+		virtual void	onNetwork();
+		virtual void	onSimulation(RealTime rdt, SimTime sdt, SimTime idt);
+		virtual void	onGraphics(RenderDevice* rd);
+		virtual void	onUserInput(UserInput* ui);
+		virtual void	onCleanup();
+		void			clearInstances();
+		PartInstance*	makePart();
+		void			drawButtons(RenderDevice* rd);
+		void			drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
+		void			makeFlag(Vector3 &vec, RenderDevice* &rd);
+		TextButtonInstance*		makeTextButton();
+		ImageButtonInstance*	makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);
+		std::vector<Instance*>	getSelection();
+		void		deleteInstance();
+		void		run();
+		void		QuitApp();
+		void		resizeWithParent(HWND parentWindow);
+		void		onCreate(HWND parentWindow);
+		void		onKeyPressed(int key);
+		void		onKeyUp(int key);
+		void		onMouseLeftPressed(HWND hwnd,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);
+		int			getMode();
+		CameraController	cameraController;
+		RenderDevice*		renderDevice;
+		UserInput*			userInput;
+		PropertyWindow*		_propWindow;
+		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
+	private:
+		void				initGUI();
+		HWND				_hWndMain;
+		SkyRef				sky;
+		bool				quit;
+		bool				mouseOnScreen;
+		bool				rightButtonHolding;
+		void				main();
+		GWindow*			_window;
+		HWND				_hwndToolbox;
+		HWND				_buttonTest;
+		HWND				_hwndRenderer;
+		DataModelInstance*	_dataModel;
+		std::string			_message;
+		G3D::RealTime		_messageTime;
+		G3D::TextureRef		shadowMap;
+		std::string			_title;
+		bool				_dragging;
+		int					_mode;
+		GAppSettings		_settings;
+		double lightProjX, lightProjY, lightProjNear, lightProjFar;
+	protected:
+		Stopwatch           m_graphicsWatch;
+		Stopwatch           m_logicWatch;
+		Stopwatch           m_networkWatch;
+		Stopwatch           m_userInputWatch;
+		Stopwatch           m_simulationWatch;
+		Stopwatch           m_waitWatch;
+};
diff --git a/BaseButtonInstance.cpp b/BaseButtonInstance.cpp
index 55e54ca..b1fb23f 100644
--- a/BaseButtonInstance.cpp
+++ b/BaseButtonInstance.cpp
@@ -12,7 +12,7 @@ BaseButtonInstance::BaseButtonInstance(void)
 
 void BaseButtonInstance::render(RenderDevice* rd)
 {
-	DataModelInstance* dataModel = Globals::dataModel;
+	DataModelInstance* dataModel = g_dataModel;
 	Vector2 pos = Vector2(dataModel->mousex,dataModel->mousey);
 	drawObj(rd, pos, dataModel->mouseButton1Down);
 	Instance::render(rd);
diff --git a/BaseButtonInstance.h b/BaseButtonInstance.h
index abb0784..3b3cb82 100644
--- a/BaseButtonInstance.h
+++ b/BaseButtonInstance.h
@@ -1,8 +1,10 @@
 #pragma once
 #include "instance.h"
-#pragma once
 #include "ButtonListener.h"
+
 class ButtonListener;
+class Instance;
+
 class BaseButtonInstance : public Instance
 {
 public:
diff --git a/ButtonListener.h b/ButtonListener.h
index 7348c6e..94c0492 100644
--- a/ButtonListener.h
+++ b/ButtonListener.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Demo.h"
+//#include "Application.h"
 #include "BaseButtonInstance.h"
 class BaseButtonInstance;
 
diff --git a/CameraButtonListener.cpp b/CameraButtonListener.cpp
new file mode 100644
index 0000000..09a1bf0
--- /dev/null
+++ b/CameraButtonListener.cpp
@@ -0,0 +1,24 @@
+#include "CameraButtonListener.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+#include "Application.h"
+
+void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	AudioPlayer::playSound(cameraSound);
+	CoordinateFrame frame = g_usableApp->cameraController.getCamera()->getCoordinateFrame();
+	if(button->name == "CenterCam" && g_selectedInstances.size() > 0)
+		g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));
+	else if(button->name == "ZoomIn")
+		g_usableApp->cameraController.Zoom(1);
+	else if(button->name == "ZoomOut")
+		g_usableApp->cameraController.Zoom(-1);
+	else if(button->name == "PanRight")
+		g_usableApp->cameraController.panRight();
+	else if(button->name == "PanLeft")
+		g_usableApp->cameraController.panLeft();
+	else if(button->name == "TiltUp")
+		g_usableApp->cameraController.tiltUp();
+	else if(button->name == "TiltDown")
+		g_usableApp->cameraController.tiltDown();
+}
\ No newline at end of file
diff --git a/CameraButtonListener.h b/CameraButtonListener.h
new file mode 100644
index 0000000..36ccaf5
--- /dev/null
+++ b/CameraButtonListener.h
@@ -0,0 +1,6 @@
+#include "ButtonListener.h"
+
+class CameraButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};
\ No newline at end of file
diff --git a/CameraController.cpp b/CameraController.cpp
index cde2de2..2349ab1 100644
--- a/CameraController.cpp
+++ b/CameraController.cpp
@@ -2,7 +2,7 @@
 #include "win32Defines.h"
 #include <iostream>
 #include "PartInstance.h"
-#include "Demo.h"
+#include "Application.h"
 #include "AudioPlayer.h"
 
 
@@ -152,7 +152,7 @@ void CameraController::centerCamera(Instance* selection)
 	}
 }
 
-void CameraController::update(Demo* demo)
+void CameraController::update(Application* app)
 {
 	float offsetSize = 0.05F;
 
diff --git a/CameraController.h b/CameraController.h
index c6c6ccb..acdb547 100644
--- a/CameraController.h
+++ b/CameraController.h
@@ -8,7 +8,7 @@
 #define CAM_ZOOM_MIN 0.1f
 #define CAM_ZOOM_MAX 100.f
 
-class Demo;
+class Application;
 
 class CameraController {
 	public:
@@ -19,7 +19,7 @@ class CameraController {
 		void lookAt(const Vector3& position);
 		void refreshZoom(const CoordinateFrame& frame);
 		void pan(CoordinateFrame* frame,float spdX,float spdY);
-		void update(Demo* demo);
+		void update(Application* app);
 		void centerCamera(Instance* selection);
 		void panLeft();
 		void panRight();
diff --git a/DeleteListener.cpp b/DeleteListener.cpp
new file mode 100644
index 0000000..9fd3c30
--- /dev/null
+++ b/DeleteListener.cpp
@@ -0,0 +1,8 @@
+#include "DeleteListener.h"
+#include "Globals.h"
+#include "Application.h"
+
+void DeleteListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	g_usableApp->deleteInstance();
+}
\ No newline at end of file
diff --git a/DeleteListener.h b/DeleteListener.h
new file mode 100644
index 0000000..4d355ef
--- /dev/null
+++ b/DeleteListener.h
@@ -0,0 +1,6 @@
+#include "ButtonListener.h"
+
+class DeleteListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};
\ No newline at end of file
diff --git a/Demo.h b/Demo.h
index a6968e5..923bbe6 100644
--- a/Demo.h
+++ b/Demo.h
@@ -7,15 +7,15 @@ class Demo { // : public GApp {
 	public:
 		Demo(const GAppSettings& settings,HWND parentWindow);
 		void Boop();
-		virtual			~Demo() {}
-		virtual void	exitApplication();
-		virtual void	onInit();
-		virtual void	onLogic();
-		virtual void	onNetwork();
-		virtual void	onSimulation(RealTime rdt, SimTime sdt, SimTime idt);
-		virtual void	onGraphics(RenderDevice* rd);
-		virtual void	onUserInput(UserInput* ui);
-		virtual void	onCleanup();
+		virtual				~Demo() {}
+		virtual void		exitApplication();
+		virtual void		onInit();
+		virtual void		onLogic();
+		virtual void		onNetwork();
+		virtual void		onSimulation(RealTime rdt, SimTime sdt, SimTime idt);
+		virtual void		onGraphics(RenderDevice* rd);
+		virtual void		onUserInput(UserInput* ui);
+		virtual void		onCleanup();
 
 		std::vector<Instance*>	getSelection();
 		void		run();
diff --git a/ErrorFunctions.cpp b/ErrorFunctions.cpp
new file mode 100644
index 0000000..bc8d5f8
--- /dev/null
+++ b/ErrorFunctions.cpp
@@ -0,0 +1,13 @@
+#include "ErrorFunctions.h"
+#include "Globals.h"
+
+void OnError(int err, std::string msg)
+{
+	//g_usableApp->window()->setInputCaptureCount(0);
+	//g_usableApp->window()->setMouseVisible(true);
+	std::string emsg = "An unexpected error has occured and "+g_PlaceholderName+" has to quit. We're sorry!" + msg;
+	std::string title = g_PlaceholderName+"Crash";
+	//clearInstances();
+	MessageBox(NULL, emsg.c_str(), title.c_str(), MB_OK);
+	exit(err);
+}
\ No newline at end of file
diff --git a/ErrorFunctions.h b/ErrorFunctions.h
new file mode 100644
index 0000000..c73590b
--- /dev/null
+++ b/ErrorFunctions.h
@@ -0,0 +1,3 @@
+#include <string>
+
+void OnError(int err, std::string msg = "");
\ No newline at end of file
diff --git a/GUDButtonListener.cpp b/GUDButtonListener.cpp
new file mode 100644
index 0000000..1cf0424
--- /dev/null
+++ b/GUDButtonListener.cpp
@@ -0,0 +1,40 @@
+#include <G3DAll.h>
+#include "Application.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+#include "GUDButtonListener.h"
+
+void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	bool cont = false;
+	for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		if(g_selectedInstances.at(i)->canDelete)
+		{
+			cont = true;	
+			break;
+		}
+	if(cont)
+	{
+		AudioPlayer::playSound(dingSound);
+		if(button->name == "Duplicate")
+		{
+			std::vector<Instance*> newinst;
+			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			{
+				if(g_selectedInstances.at(i)->canDelete)
+				{
+				Instance* tempinst = g_selectedInstances.at(i);
+				
+				Instance* clonedInstance = g_selectedInstances.at(i)->clone();
+
+				newinst.push_back(tempinst);
+				}
+				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
+				g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
+			}
+			g_selectedInstances = newinst;
+			if(g_selectedInstances.size() > 0)
+				g_usableApp->_propWindow->UpdateSelected(newinst.at(0));
+		}
+	}
+}
\ No newline at end of file
diff --git a/GUDButtonListener.h b/GUDButtonListener.h
new file mode 100644
index 0000000..ef0623e
--- /dev/null
+++ b/GUDButtonListener.h
@@ -0,0 +1,6 @@
+#include "ButtonListener.h"
+
+class GUDButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};
diff --git a/Globals.cpp b/Globals.cpp
index 1c00f66..79c3195 100644
--- a/Globals.cpp
+++ b/Globals.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
+#include "Application.h"
 
-DataModelInstance* Globals::dataModel = NULL;
 int const Globals::gen = 0;
 int const Globals::major = 0;
 int const Globals::minor = 4;
@@ -9,11 +9,23 @@ 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*>();
+DataModelInstance* g_dataModel = NULL;
+
 bool running = false;
 G3D::TextureRef Globals::surface;
 POINT Globals::mousepoint;
+
+GFontRef fntdominant = NULL;
+GFontRef fntlighttrek = NULL;
+
 Globals::Globals(void){}
 
 Globals::~Globals(void){}
+
+std::string cameraSound="";
+std::string clickSound="";
+std::string dingSound="";
+
+Application *g_usableApp = NULL;
\ No newline at end of file
diff --git a/Globals.h b/Globals.h
index 09efa1b..60d3c5d 100644
--- a/Globals.h
+++ b/Globals.h
@@ -2,6 +2,8 @@
 #include "DataModelInstance.h"
 #include <G3DAll.h>
 
+class Application;
+
 class Globals
 {
 public:
@@ -17,9 +19,19 @@ public:
 	static const int patch;
 	static G3D::TextureRef surface;
 	static int surfaceId;
-	static const std::string PlaceholderName;
+	static const std::string g_PlaceholderName;
 };
 
 extern std::vector<Instance*> postRenderStack;
 extern std::vector<Instance*> g_selectedInstances;
-extern bool running;
\ No newline at end of file
+extern bool running;
+extern DataModelInstance* g_dataModel;
+extern Application* g_usableApp;
+
+extern GFontRef fntdominant;
+extern GFontRef fntlighttrek;
+
+extern std::string cameraSound;
+extern std::string clickSound;
+extern std::string dingSound;
+const std::string g_PlaceholderName = "HyperCube";
\ No newline at end of file
diff --git a/IEBrowser.cpp b/IEBrowser.cpp
index 9902814..b7f26e6 100644
--- a/IEBrowser.cpp
+++ b/IEBrowser.cpp
@@ -99,7 +99,7 @@ bool IEBrowser::navigateSyncURL(wchar_t* url)
 	}
 	else
 	{
-		MessageBox(NULL,"Cannot read IWebBrowser2...",(Globals::PlaceholderName+" Crash").c_str(),MB_OK);
+		MessageBox(NULL,"Cannot read IWebBrowser2...",(g_PlaceholderName+" Crash").c_str(),MB_OK);
 	}
 	return false;
 }
diff --git a/ImageButtonInstance.h b/ImageButtonInstance.h
index eaad788..9b1dfd8 100644
--- a/ImageButtonInstance.h
+++ b/ImageButtonInstance.h
@@ -1,5 +1,8 @@
 #pragma once
 #include "BaseButtonInstance.h"
+
+class BaseButtonInstance;
+
 class ImageButtonInstance : public BaseButtonInstance
 {
 public:
diff --git a/Instance.h b/Instance.h
index 1d57b01..14dac66 100644
--- a/Instance.h
+++ b/Instance.h
@@ -1,7 +1,7 @@
-
 #pragma once
 #include <G3DAll.h>
 #include "propertyGrid.h"
+
 class Instance
 {
 public:
diff --git a/ModeSelectionListener.cpp b/ModeSelectionListener.cpp
new file mode 100644
index 0000000..1128ca2
--- /dev/null
+++ b/ModeSelectionListener.cpp
@@ -0,0 +1,28 @@
+#include "Globals.h"
+#include "Instance.h"
+#include "ModeSelectionListener.h"
+#include "Application.h"
+
+void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	//CoordinateFrame frame = g_usableApp->g3dCamera.getCoordinateFrame();
+	int mode = g_usableApp->getMode();
+
+	std::vector<Instance*> instances_2D = g_dataModel->getGuiRoot()->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+		{
+			if(instances_2D.at(i)->name == "Cursor" || instances_2D.at(i)->name == "Resize" || instances_2D.at(i)->name == "Arrows")
+			{
+				BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i);
+				button->selected = false;
+			}
+		}
+
+	button->selected = true;
+	if(button->name == "Cursor")
+		mode = CURSOR;
+	else if(button->name == "Resize")
+		mode = RESIZE;
+	else if(button->name == "Arrows")
+		mode = ARROWS;
+}
diff --git a/ModeSelectionListener.h b/ModeSelectionListener.h
new file mode 100644
index 0000000..c3aa8a6
--- /dev/null
+++ b/ModeSelectionListener.h
@@ -0,0 +1,10 @@
+#include "ButtonListener.h"
+
+#define CURSOR 0
+#define ARROWS 1
+#define RESIZE 2
+
+class ModeSelectionListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};
diff --git a/RotateButtonListener.cpp b/RotateButtonListener.cpp
new file mode 100644
index 0000000..0a408e4
--- /dev/null
+++ b/RotateButtonListener.cpp
@@ -0,0 +1,20 @@
+#include "RotateButtonListener.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+
+void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	if(g_selectedInstances.size() > 0)
+	{
+		Instance* selectedInstance = g_selectedInstances.at(0);
+		AudioPlayer::playSound(clickSound);
+		if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
+		{
+			if(button->name == "Tilt")
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,0,toRadians(90)));
+			else if(button->name == "Rotate")
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,toRadians(90),0));
+		}
+	}
+		
+}
diff --git a/RotateButtonListener.h b/RotateButtonListener.h
new file mode 100644
index 0000000..b836239
--- /dev/null
+++ b/RotateButtonListener.h
@@ -0,0 +1,6 @@
+#include "ButtonListener.h"
+
+class RotateButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};
\ No newline at end of file
diff --git a/StringFunctions.h b/StringFunctions.h
new file mode 100644
index 0000000..5fdb3bd
--- /dev/null
+++ b/StringFunctions.h
@@ -0,0 +1,31 @@
+#include <string>
+#include <sstream>
+#include "ErrorFunctions.h"
+
+std::string Convert (float number){
+    std::ostringstream buff;
+    buff<<number;
+    return buff.str();   
+}
+
+std::string ExePath() {
+    char buffer[MAX_PATH];
+	GetModuleFileName( NULL, buffer, MAX_PATH );
+	std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" );
+	return std::string( buffer ).substr( 0, pos);
+}
+
+std::string GetFileInPath(std::string file)
+{
+	std::string name = ExePath() + file;
+	struct stat buf;
+    if (stat(name.c_str(), &buf) != -1)
+    {
+        return name;
+    }
+	else
+		OnError(202, " \r\nFile not found: " + name);
+		return NULL;
+		
+	
+}
diff --git a/main.cpp b/main.cpp
index 352f1eb..f82ad29 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,10 +1,6 @@
 /**
-	Roblox 2005 Recreation Project
-	© 2018-2019 Roblox 2005 Recreation Project Team
-	
 	Licensed under GPLv2
-
-	Based on G3D 6.10 © 2003-2006 Morgan McGuire.
+	Based on G3D 6.10 © 2003-2006 Morgan McGuire.
  */
 
 // TODO: Move toolbar buttons with resized window.
@@ -24,7 +20,7 @@
 #include "CameraController.h"
 #include "AudioPlayer.h"
 #include "Globals.h"
-#include "Demo.h"
+#include "Application.h"
 #include "win32Defines.h"
 #include "WindowFunctions.h"
 #include <limits.h>
@@ -37,10 +33,7 @@
 #include "IEBrowser.h"
 #include "PropertyWindow.h"
 #include <commctrl.h>
-#include <exception>
-#include <fstream>
-#include <string>
-#include <iostream>
+#include "ErrorFunctions.h"
 
 #if G3D_VER < 61000
 	#error Requires G3D 6.10
@@ -55,1425 +48,9 @@ DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
 EXCEPINFO excepinfo;
 UINT nArgErr;
 
-static std::string title = "";
-static DataModelInstance* dataModel;
-GFontRef fntdominant = NULL;
-GFontRef fntlighttrek = NULL;
-Ray testRay;
-static std::string message = "";
-static G3D::RealTime messageTime = 0;
-static std::string tempPath = "";
-static std::string cameraSound = "";
-static std::string clickSound = "";
-static std::string dingSound = "";
-static int cursorid = 0;
-static int cursorOvrid = 0;
-static int currentcursorid = 0;
-static G3D::TextureRef cursor = NULL;
-static G3D::TextureRef cursorOvr = NULL;
-static bool running = true;
-static bool mouseMovedBeginMotion = false;
-static const int CURSOR = 0;
-static const int ARROWS = 1;
-static const int RESIZE = 2;
-static POINT oldGlobalMouse;
-static int mode = CURSOR;
-bool dragging = false;
-Vector2 oldMouse = Vector2(0,0);
-float moveRate = 0.5;
-static const std::string PlaceholderName = "HyperCube";
-
-Demo *usableApp = NULL;
-
-Demo::Demo(const GAppSettings& settings,HWND parentWindow) { //: GApp(settings,window) {
-	_hWndMain = parentWindow;
-
-	HMODULE hThisInstance = GetModuleHandle(NULL);
-
-	_hwndToolbox = CreateWindowEx(
-		WS_EX_ACCEPTFILES,
-		"AX",
-		"{8856F961-340A-11D0-A96B-00C04FD705A2}",
-		WS_CHILD | WS_VISIBLE,
-		0,
-		560,
-		800,
-		60,
-		_hWndMain, // parent
-		NULL, // menu
-		hThisInstance,
-		NULL
-	);
-	
-	_hwndRenderer = CreateWindowEx(
-		WS_EX_ACCEPTFILES,
-		"G3DWindow",
-		"3D",
-		WS_CHILD,
-		CW_USEDEFAULT,
-		CW_USEDEFAULT,
-		1,
-		1,
-		_hWndMain, // parent
-		NULL, // menu
-		hThisInstance,
-		NULL
-	);
-
-	Win32Window* window = Win32Window::create(settings.window,_hwndRenderer);
-	ShowWindow(_hwndRenderer, SW_SHOW);
-	ShowWindow(_hWndMain, SW_SHOW);
-
-	quit=false;
-	rightButtonHolding=false;
-	mouseOnScreen=false;
-	// GApp replacement
-	renderDevice = new RenderDevice();
-	if (window != NULL) {
-	renderDevice->init(window, NULL);
-	}
-	else
-	{
-		MessageBox(NULL,"Window not found!","Error",MB_OK | MB_ICONSTOP);
-		return;
-	}
-
-    _window = renderDevice->window();
-    _window->makeCurrent();
-
-	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
-	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
-	_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
-	IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
-	//webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/");
-}
-
-void clearInstances()
-{
-	delete dataModel;
-}
-
-void OnError(int err, std::string msg = "")
-{
-	//usableApp->window()->setInputCaptureCount(0);
-	//usableApp->window()->setMouseVisible(true);
-	std::string emsg = "An unexpected error has occured and "+PlaceholderName+" has to quit. We're sorry!" + msg;
-	std::string title = PlaceholderName+"Crash";
-	//clearInstances();
-	MessageBox(NULL, emsg.c_str(), title.c_str(), MB_OK);
-	exit(err);
-}
-
-std::string ExePath() {
-    char buffer[MAX_PATH];
-	GetModuleFileName( NULL, buffer, MAX_PATH );
-	std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" );
-	return std::string( buffer ).substr( 0, pos);
-}
-
-std::string GetFileInPath(std::string file)
-{
-	std::string name = ExePath() + file;
-	struct stat buf;
-    if (stat(name.c_str(), &buf) != -1)
-    {
-        return name;
-    }
-	else
-		OnError(202, " \r\nFile not found: " + name);
-		return NULL;
-		
-	
-}
-
-#include <sstream>
-std::string Convert (float number){
-    std::ostringstream buff;
-    buff<<number;
-    return buff.str();   
-}
-
-
-PartInstance* makePart()
-{
-	PartInstance* part = new PartInstance();
-	return part;
-}
-
-TextButtonInstance* makeTextButton()
-{
-	TextButtonInstance* part = new TextButtonInstance();
-	return part;
-}
-
-ImageButtonInstance* makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
-{
-	ImageButtonInstance* part = new ImageButtonInstance(newImage,overImage, downImage, disableImage);
-//	instances.push_back(part);
-//	instances_2D.push_back(part);
-	return part;
-}
-
-
-
-class CameraButtonListener : public ButtonListener {
-public:
-	void onButton1MouseClick(BaseButtonInstance*);
-};
-
-void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
-{
-	AudioPlayer::playSound(cameraSound);
-	CoordinateFrame frame = usableApp->cameraController.getCamera()->getCoordinateFrame();
-	if(button->name == "CenterCam" && g_selectedInstances.size() > 0)
-		usableApp->cameraController.centerCamera(g_selectedInstances.at(0));
-	else if(button->name == "ZoomIn")
-		usableApp->cameraController.Zoom(1);
-	else if(button->name == "ZoomOut")
-		usableApp->cameraController.Zoom(-1);
-	else if(button->name == "PanRight")
-		usableApp->cameraController.panRight();
-	else if(button->name == "PanLeft")
-		usableApp->cameraController.panLeft();
-	else if(button->name == "TiltUp")
-		usableApp->cameraController.tiltUp();
-	else if(button->name == "TiltDown")
-		usableApp->cameraController.tiltDown();
-}
-
-class GUDButtonListener : public ButtonListener {
-public:
-	void onButton1MouseClick(BaseButtonInstance*);
-};
-
-void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
-{
-	bool cont = false;
-	for(size_t i = 0; i < g_selectedInstances.size(); i++)
-		if(g_selectedInstances.at(i)->canDelete)
-		{
-			cont = true;	
-			break;
-		}
-	if(cont)
-	{
-		AudioPlayer::playSound(dingSound);
-		if(button->name == "Duplicate")
-		{
-			std::vector<Instance*> newinst;
-			for(size_t i = 0; i < g_selectedInstances.size(); i++)
-			{
-				if(g_selectedInstances.at(i)->canDelete)
-				{
-				Instance* tempinst = g_selectedInstances.at(i);
-				
-				Instance* clonedInstance = g_selectedInstances.at(i)->clone();
-
-				newinst.push_back(tempinst);
-				}
-				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
-				usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
-			}
-			g_selectedInstances = newinst;
-			if(g_selectedInstances.size() > 0)
-				usableApp->_propWindow->UpdateSelected(newinst.at(0));
-		}
-	}
-}
-
-class RotateButtonListener : public ButtonListener {
-public:
-	void onButton1MouseClick(BaseButtonInstance*);
-};
-
-void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
-{
-	if(g_selectedInstances.size() > 0)
-	{
-		Instance* selectedInstance = g_selectedInstances.at(0);
-		AudioPlayer::playSound(clickSound);
-		if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
-		{
-			if(button->name == "Tilt")
-				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,0,toRadians(90)));
-			else if(button->name == "Rotate")
-				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,toRadians(90),0));
-		}
-	}
-		
-}
-
-
-void deleteInstance()
-{
-	if(g_selectedInstances.size() > 0)
-	{
-		size_t undeletable = 0;
-		while(g_selectedInstances.size() > undeletable)
-		{
-			if(g_selectedInstances.at(0)->canDelete)
-			{
-				AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
-				Instance* selectedInstance = g_selectedInstances.at(0);
-				if(selectedInstance->getParent() != NULL)
-					selectedInstance->getParent()->removeChild(selectedInstance);
-				delete selectedInstance;
-				selectedInstance = NULL;
-				g_selectedInstances.erase(g_selectedInstances.begin());
-			}
-			else
-			{
-				undeletable++;
-			}
-		}
-	}
-	if(g_selectedInstances.size() == 0)
-		usableApp->_propWindow->ClearProperties();
-}
-
-
-class DeleteListener : public ButtonListener {
-public:
-	void onButton1MouseClick(BaseButtonInstance*);
-};
-
-void DeleteListener::onButton1MouseClick(BaseButtonInstance* button)
-{
-	deleteInstance();
-}
-
-
-
-
-class ModeSelectionListener : public ButtonListener {
-public:
-	void onButton1MouseClick(BaseButtonInstance*);
-};
-
-
-void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
-{
-	//CoordinateFrame frame = usableApp->g3dCamera.getCoordinateFrame();
-	
-	std::vector<Instance*> instances_2D = dataModel->getGuiRoot()->getAllChildren();
-	for(size_t i = 0; i < instances_2D.size(); i++)
-		{
-			if(instances_2D.at(i)->name == "Cursor" || instances_2D.at(i)->name == "Resize" || instances_2D.at(i)->name == "Arrows")
-			{
-				BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i);
-				button->selected = false;
-			}
-		}
-
-	button->selected = true;
-	if(button->name == "Cursor")
-		mode = CURSOR;
-	else if(button->name == "Resize")
-		mode = RESIZE;
-	else if(button->name == "Arrows")
-		mode = ARROWS;
-}
-
-
-void Demo::initGUI()
-{
-	TextButtonInstance* button = makeTextButton();
-	button->boxBegin = Vector2(0, -24);
-	button->boxEnd = Vector2(80, 0);
-	button->floatBottom = true;
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3(0,255,255);
-	button->textOutlineColor = Color4::clear();
-	button->title = "Hopper";
-	button->fontLocationRelativeTo = Vector2(10, 3);
-	button->setAllColorsSame();
-	
-	button = makeTextButton();
-	button->boxBegin = Vector2(0, -48);
-	button->boxEnd = Vector2(80, -24);
-	button->floatBottom = true;
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3(0,255,255);
-	button->textOutlineColor = Color4::clear();
-	button->title = "Controller";
-	button->fontLocationRelativeTo = Vector2(10, 3);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0, -72);
-	button->boxEnd = Vector2(80, -48);
-	button->floatBottom = true;
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3(0,255,255);
-	button->textOutlineColor = Color4::clear();
-	button->title = "Color";
-	button->fontLocationRelativeTo = Vector2(10, 3);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0, -96);
-	button->boxEnd = Vector2(80, -72);
-	button->floatBottom = true;
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3(0,255,255);
-	button->textOutlineColor = Color4::clear();
-	button->title = "Surface";
-	button->fontLocationRelativeTo = Vector2(10, 3);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0, -120);
-	button->boxEnd = Vector2(80, -96);
-	button->floatBottom = true;
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3(0,255,255);
-	button->boxOutlineColor = Color3(0,255,255);
-	button->title = "Model";
-	button->fontLocationRelativeTo = Vector2(10, 3);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0, 0);
-	button->boxEnd = Vector2(125, 25);
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->title = "File";
-	button->textSize = 16;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(125, 0);
-	button->boxEnd = Vector2(250, 25);
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->title = "Edit";
-	button->textSize = 16;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(250, 0);
-	button->boxEnd = Vector2(375, 25);
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->title = "View";
-	button->textSize = 16;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(375, 0);
-	button->boxEnd = Vector2(500, 25);
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->title = "Insert";
-	button->textSize = 16;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setAllColorsSame();
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(500, 0);
-	button->boxEnd = Vector2(625, 25);
-	button->setParent(dataModel->getGuiRoot());
-	button->font = fntlighttrek;
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->title = "Format";
-	button->textSize = 16;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setAllColorsSame();
-
-
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0,215);
-	button->boxEnd = Vector2(80,235);
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textSize = 12;
-	button->title = "Group";
-	button->name = "Group";
-	button->setAllColorsSame();	
-	button->textColorDis = Color3(0.8F,0.8F,0.8F);
-	button->font = fntlighttrek;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setParent(dataModel->getGuiRoot());
-
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0,240);
-	button->boxEnd = Vector2(80,260);
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textSize = 12;
-	button->title = "UnGroup";
-	button->name = "UnGroup";
-	button->setAllColorsSame();
-	button->textColorDis = Color3(0.8F,0.8F,0.8F);
-	button->font = fntlighttrek;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setParent(dataModel->getGuiRoot());
-
-	button = makeTextButton();
-	button->boxBegin = Vector2(0,265);
-	button->boxEnd = Vector2(80,285);
-	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
-	button->textColor = Color3::white();
-	button->boxColor = Color4::clear();
-	button->textSize = 12;
-	button->title = "Duplicate";
-	button->setAllColorsSame();
-	button->textColorDis = Color3(0.8F,0.8F,0.8F);
-	button->font = fntlighttrek;
-	button->fontLocationRelativeTo = Vector2(10, 0);
-	button->setParent(dataModel->getGuiRoot());
-	button->name = "Duplicate";
-	button->setButtonListener(new GUDButtonListener());
-
-	ImageButtonInstance* instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/Run.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")));
-	instance->name = "go";
-	instance->size = Vector2(65,65);
-	instance->position = Vector2(6.5, 25);
-	instance->setParent(dataModel->getGuiRoot());
-
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/ArrowTool.png")),
-		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_dn.png")),
-		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ds.png")));
-	instance->size = Vector2(50,50);
-	instance->position = Vector2(15, 90);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Cursor";
-	instance->setButtonListener(new ModeSelectionListener());
-
-	instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
-	instance->size = Vector2(40,40);
-	instance->position = Vector2(0, 140);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Resize";
-	instance->setButtonListener(new ModeSelectionListener());
-	
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),
-		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/MoveTool_dn.png")),
-		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ds.png")));
-	instance->size = Vector2(40,40);
-	instance->position = Vector2(40, 140);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Arrows";
-	instance->setButtonListener(new ModeSelectionListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")),
-		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ovr.png")),
-		NULL,
-		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ds.png")));
-	instance->size = Vector2(30,30);
-	instance->position = Vector2(10, 175);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Rotate";
-	instance->setButtonListener(new RotateButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")),
-		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ovr.png")),
-		NULL,
-		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ds.png")));
-	instance->size = Vector2(30,30);
-	instance->position = Vector2(40, 175);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Tilt";
-	instance->setButtonListener(new RotateButtonListener());
-
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/Delete.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Delete_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Delete_dn.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Delete_ds.png")));
-	instance->size = Vector2(40,46);
-	instance->position = Vector2(20, 284);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "Delete";
-	instance->setButtonListener(new DeleteListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_dn.png")));
-	instance->size = Vector2(34,25);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-77, -90);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "ZoomIn";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_dn.png")));
-	instance->size = Vector2(34,26);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-77, -31);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "ZoomOut";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_dn.png")));
-	instance->size = Vector2(34,34);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-110, -50);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "PanLeft";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_dn.png")));
-	instance->size = Vector2(34,34);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-45, -50);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "PanRight";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_dn.png")));
-	instance->size = Vector2(34,20);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-77, -60);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "CenterCam";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_dn.png")));
-	instance->size = Vector2(24,24);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-105, -75);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "TiltUp";
-	instance->setButtonListener(new CameraButtonListener());
-
-	instance = makeImageButton(
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_dn.png")));
-	instance->size = Vector2(24,24);
-	instance->floatBottom = true;
-	instance->floatRight = true;
-	instance->position = Vector2(-40, -75);
-	instance->setParent(dataModel->getGuiRoot());
-	instance->name = "TiltDown";
-	instance->setButtonListener(new CameraButtonListener());
-}
-
-
-void Demo::onInit()  {
-	
-    // Called before Demo::run() beings
-	cameraController.setFrame(Vector3(0,2,10));
-	dataModel = new DataModelInstance();
-	dataModel->setParent(NULL);
-	dataModel->name = "undefined";
-	dataModel->font = fntdominant;
-	Globals::dataModel = dataModel;
-	
-	initGUI();
-
-#ifdef LEGACY_LOAD_G3DFUN_LEVEL
-	PartInstance* test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3(0.2F,0.3F,1);
-	test->setSize(Vector3(24,1,24));
-	test->setPosition(Vector3(0,0,0));
-	test->setCFrame(test->getCFrame() * Matrix3::fromEulerAnglesXYZ(0,toRadians(0),toRadians(0)));
-	
-
-	
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3(.5F,1,.5F);
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(-10,1,0));
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3(.5F,1,.5F);
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(10,1,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(7,2,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(-7,2,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(4,3,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(-5,3,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(1,4,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(-3,4,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(-2,5,0));
-	
-
-	
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(0,6,0));
-
-	test = makePart();
-	test->setParent(dataModel->getWorkspace());
-	test->color = Color3::gray();
-	test->setSize(Vector3(4,1,2));
-	test->setPosition(Vector3(2,7,0));
-#else
-	dataModel->debugGetOpen();
-#endif
-	
-
-
-
-	//setDesiredFrameRate(60);
-	
-	
-	
-
-    //GApplet::onInit();
-	
-}
-
-
-
-
-
-
-void Demo::onCleanup() {
-    clearInstances();
-	sky->~Sky();
-}
-
-
-
-
-void Demo::onLogic() {
-    // Add non-simulation game logic and AI code here
-
-		
-
-
-}
-
-
-void Demo::onNetwork() {
-	// Poll net messages here
-}
-
-
-//double getVectorDistance(Vector3 vector1, Vector3 vector2)
-//{
-//	return pow(pow((double)vector1.x - (double)vector2.x, 2) + pow((double)vector1.y - (double)vector2.y, 2) + pow((double)vector1.z - (double)vector2.z, 2), 0.5);
-//}
-
-std::vector<Instance*> Demo::getSelection()
-{
-	return g_selectedInstances;
-}
-void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
-
-	
-		
-		Instance * obj6 = dataModel->getGuiRoot()->findFirstChild("Delete");
-		Instance * obj = dataModel->getGuiRoot()->findFirstChild("Duplicate");
-		Instance * obj2 = dataModel->getGuiRoot()->findFirstChild("Group");
-		Instance * obj3 = dataModel->getGuiRoot()->findFirstChild("UnGroup");
-		Instance * obj4 = dataModel->getGuiRoot()->findFirstChild("Rotate");
-		Instance * obj5 = dataModel->getGuiRoot()->findFirstChild("Tilt");
-		if(obj != NULL && obj2 != NULL && obj3 != NULL && obj4 !=NULL && obj5 != NULL && obj6 != NULL)
-		{
-			BaseButtonInstance* button = (BaseButtonInstance*)obj;
-			BaseButtonInstance* button2 = (BaseButtonInstance*)obj2;
-			BaseButtonInstance* button3 = (BaseButtonInstance*)obj3;
-			BaseButtonInstance* button4 = (BaseButtonInstance*)obj4;
-			BaseButtonInstance* button5 = (BaseButtonInstance*)obj5;
-			BaseButtonInstance* button6 = (BaseButtonInstance*)obj6;
-			button->disabled = true;
-			button2->disabled = true;
-			button3->disabled = true;
-			button4->disabled = true;
-			button5->disabled = true;
-			button6->disabled = true;
-			for(size_t i = 0; i < g_selectedInstances.size(); i++)
-				if(g_selectedInstances.at(i)->canDelete)
-				{
-					button->disabled = false;
-					button2->disabled = false;
-					button3->disabled = false;
-					button4->disabled = false;
-					button5->disabled = false;
-					button6->disabled = false;
-					break;
-				}
-		}
-
-
-	if(dataModel->name != title)
-	{
-		title = dataModel->name;
-		std::string text = "Game \"" + title + "\"";
-		SetWindowText(_hWndMain, text.c_str());
-		
-	}
-
-	cameraController.update(this);
-
-}
-
-/*double getOSVersion() {
-    OSVERSIONINFO osvi;
-
-    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-    GetVersionEx(&osvi);
-	std::string version = Convert(osvi.dwMajorVersion) + "." + Convert(osvi.dwMinorVersion);
-	return ::atof(version.c_str());
-}*/
-
-bool IsHolding(int button)
-{
-	return (GetKeyState(button) >> 1)>0;
-}
-
-
-
-BOOL GetKPBool(int VK) {
-	return (GetKeyState(VK) & 0x8000);
-}
-
-void Demo::onUserInput(UserInput* ui) {
-
-	
-	/*if(GetHoldKeyState(VK_LCONTROL))
-	{
-		if(GetHoldKeyState('D'))
-		{
-			messageTime = System::time();
-			if()
-				message = "Debug Mode Disabled";
-			else
-				message = "Debug Mode Enabled";
-			setDebugMode(!debugMode());
-		}
-	}*/
-	
-	if(GetHoldKeyState(VK_F8))
-	{
-		messageTime = System::time();
-		message = "FOV Set to 10";
-		
-	}
-	//}
-
-	//dataModel->mousex = ui->getMouseX();
-	//dataModel->mousey = ui->getMouseY();
-	dataModel->mouseButton1Down = (GetKeyState(VK_LBUTTON) & 0x100) != 0;
-
-	if (GetHoldKeyState(VK_LBUTTON)) {
-		if (dragging) {
-			PartInstance* part = NULL;
-			if(g_selectedInstances.size() > 0)
-				part = (PartInstance*) g_selectedInstances.at(0);
-		Ray dragRay = cameraController.getCamera()->worldRay(dataModel->mousex, dataModel->mousey, renderDevice->getViewport());
-		std::vector<Instance*> instances = dataModel->getWorkspace()->getAllChildren();
-		for(size_t i = 0; i < instances.size(); i++)
-			{
-				if(PartInstance* moveTo = dynamic_cast<PartInstance*>(instances.at(i)))
-				{
-					float __time = testRay.intersectionTime(moveTo->getBox());
-					float __nearest=std::numeric_limits<float>::infinity();
-					if (__time != inf()) 
-					{
-						if (__nearest>__time)
-						{
-							Vector3 closest = (dragRay.closestPoint(moveTo->getPosition()) * 2);
-							part->setPosition(closest);
-							//part->setPosition(Vector3(floor(closest.x),part->getPosition().y,floor(closest.z)));
-						}
-					}
-				}
-			}
-			Sleep(10);
-		}
-	}
-	// Camera KB Handling {
-		if (GetKPBool(VK_OEM_COMMA)) //Left
-			usableApp->cameraController.panLeft();
-		else if (GetKPBool(VK_OEM_PERIOD)) // Right
-			usableApp->cameraController.panRight();
-		else if (GetKPBool(0x49)) // Zoom In (I)
-			usableApp->cameraController.Zoom(1);
-		else if (GetKPBool(0x4F)) // Zoom Out (O)
-			usableApp->cameraController.Zoom(-1);
-	// }
-
-	//readMouseGUIInput();
-	// Add other key handling here
-}
-
-void makeFlag(Vector3 &vec, RenderDevice* &rd)
-{
-
-	Vector3 up = Vector3(vec.x, vec.y+3, vec.z);
-	rd->setColor(Color3::blue());
-	rd->beforePrimitive();
-
-		glBegin(GL_LINES);
-		glVertex3f(vec.x, vec.y, vec.z);
-		glVertex3f(up.x, up.y, up.z);
-		glEnd();
-
-		glBegin( GL_TRIANGLES );
-		glVertex3f(up.x, up.y-1, up.z);
-		glVertex3f(up.x, up.y-0.5, up.z-1);
-		glVertex3f(up.x, up.y, up.z);
-		
-		glVertex3f(up.x, up.y, up.z);
-		glVertex3f(up.x, up.y-0.5, up.z-1);
-		glVertex3f(up.x, up.y-1, up.z);
-
-		glEnd();
-	rd->afterPrimitive();
-	rd->setColor(Color3::white());
-	//I know how i will approach this now
-}
-
-
-
-/*bool mouseInArea(float point1x, float point1y, float point2x, float point2y)
-{
-	
-
-	if(dataModel->mousex >= point1x && dataModel->mousey >= point1y)
-	{
-		if(dataModel->mousex < point2x && dataModel->mousey < point2y)
-		{
-			return true;
-		}
-	}
-	return false;
-}*/
-
-
-void drawButtons(RenderDevice* rd)
-{
-	rd->pushState();
-	rd->beforePrimitive();
-			dataModel->getGuiRoot()->render(rd);
-	rd->afterPrimitive();
-	rd->popState();
-}
-
-void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c)
-{
-
-	Color3 outline = Color3::cyan();//Color3(0.098F,0.6F,1.0F);
-	float offsetSize = 0.05F;
-	//X
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
-	//Y
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
-
-	//Z
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
-	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
-	
-	if(mode == ARROWS)
-	{
-		rd->setLight(0, NULL);
-		rd->setAmbientLightColor(Color3(1,1,1));
-		
-		AABox box;
-		c.toWorldSpace(Box(from, to)).getBounds(box);
-		float max = box.high().y - pos.y;
-
-		Draw::arrow(pos, Vector3(0, 1.5+max, 0), rd);
-		Draw::arrow(pos, Vector3(0, (-1.5)-max, 0), rd);
-		
-		max = box.high().x - pos.x;
-
-		Draw::arrow(pos, Vector3(1.5+max, 0, 0), rd);
-		Draw::arrow(pos, Vector3((-1.5)-max, 0, 0), rd);
-
-		max = box.high().z - pos.z;
-
-		Draw::arrow(pos, Vector3(0, 0, 1.5+max), rd);
-		Draw::arrow(pos, Vector3(0, 0, (-1.5)-max), rd);
-
-
-
-		rd->setAmbientLightColor(lighting.ambient);
-		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
-	}
-	else if(mode == RESIZE)
-	{
-		Color3 sphereColor = outline;
-		rd->setLight(0, NULL);
-		rd->setAmbientLightColor(Color3(1,1,1));
-		Vector3 gamepoint = pos;
-		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 < 200)
-		{
-			
-			float multiplier = distance * 0.025F/2;
-			if(multiplier < 0.25F)
-				multiplier = 0.25F;
-			Vector3 position = pos + (c.lookVector()*((size.z/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-			position = pos - (c.lookVector()*((size.z/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-
-			position = pos + (c.rightVector()*((size.x/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-			position = pos - (c.rightVector()*((size.x/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-
-			position = pos + (c.upVector()*((size.y/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-			position = pos - (c.upVector()*((size.y/2)+1));
-			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
-		}
-		rd->setAmbientLightColor(lighting.ambient);
-		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
-	}
-	
-}
-
-void Demo::exitApplication()
-{
-	//endApplet = true;
-    //endProgram = true;
-}
-
-
-void Demo::onGraphics(RenderDevice* rd) {
-	
-	G3D::uint8 num = 0;
-	POINT mousepos;
-	mouseOnScreen = true;
-	if (GetCursorPos(&mousepos))
-	{
-		POINT pointm = mousepos;
-	if (ScreenToClient(_hWndMain, &mousepos))
-	{
-		//mouseOnScreen = true;
-		//POINT pointm;
-		///GetCursorPos(&pointm);
-		if(_hwndRenderer != WindowFromPoint(pointm)) //OLD: mousepos.x < 1 || mousepos.y < 1 || mousepos.x >= rd->getViewport().width()-1 || mousepos.y >= rd->getViewport().height()-1
-		{
-			mouseOnScreen = false;
-			//ShowCursor(true);
-			_window->setMouseVisible(true);
-			//rd->window()->setInputCaptureCount(0);
-		}
-		else
-		{
-			mouseOnScreen = true;
-			//SetCursor(NULL);
-			_window->setMouseVisible(false);
-			//rd->window()->setInputCaptureCount(1);
-		}
-		
-	}
-	}
-	
-	if(Globals::useMousePoint)
-	{
-		mousepos = Globals::mousepoint;
-		ScreenToClient(_hWndMain, &mousepos);
-	}
-	
-    LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM));
-    renderDevice->setProjectionAndCameraMatrix(*cameraController.getCamera());
-	
-    // Cyan background
-    //renderDevice->setColorClearValue(Color3(0.0f, 0.5f, 1.0f));
-
-    renderDevice->clear(sky.isNull(), true, true);
-    if (sky.notNull()) {
-        sky->render(renderDevice, lighting);
-    }
-	
-    // Setup lighting
-    renderDevice->enableLighting();
-
-	renderDevice->setShadeMode(RenderDevice::SHADE_SMOOTH);
-	renderDevice->setAmbientLightColor(Color3(1,1,1));
-
-	renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
-	renderDevice->setAmbientLightColor(lighting.ambient);
-	
-	rd->beforePrimitive();
-	CoordinateFrame forDraw = rd->getObjectToWorldMatrix();
-	dataModel->getWorkspace()->render(rd);
-	rd->setObjectToWorldMatrix(forDraw);
-	rd->afterPrimitive();
-
-	if(g_selectedInstances.size() > 0)
-	{
-		for(size_t i = 0; i < g_selectedInstances.size(); i++)
-		{
-			if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
-			{
-			Vector3 size = part->getSize();
-			Vector3 pos = part->getPosition();
-			drawOutline(Vector3(0+size.x/2, 0+size.y/2, 0+size.z/2) ,Vector3(0-size.x/2,0-size.y/2,0-size.z/2), rd, lighting, Vector3(size.x/2, size.y/2, size.z/2), Vector3(pos.x/2, pos.y/2, pos.z/2), part->getCFrameRenderBased());
-			}
-		}
-	}
-	
-
-	//Vector3 gamepoint = Vector3(0, 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 < 50 && distance > -50)
-	
-	//{
-	//	if(distance < 0)
-	//	distance = distance*-1;
-	//	fntdominant->draw3D(rd, "Testing", CoordinateFrame(rd->getCameraToWorldMatrix().rotation, gamepoint), 0.04*distance, Color3::yellow(), Color3::black(), G3D::GFont::XALIGN_CENTER, G3D::GFont::YALIGN_CENTER);
-	//}
-
-    renderDevice->disableLighting();
-
-    if (sky.notNull()) {
-        sky->renderLensFlare(renderDevice, lighting);
-    }
-	renderDevice->push2D();
-		if(System::time() - 3 < messageTime)
-		{
-			fntdominant->draw2D(rd, message, Vector2((rd->getWidth()/2)-(fntdominant->get2DStringBounds(message, 20).x/2),(rd->getHeight()/2)-(fntdominant->get2DStringBounds(message, 20).y/2)), 20, Color3::yellow(), Color3::black());
-		}
-
-		//TODO--Move these to their own instance
-
-		std::stringstream stream;
-		stream << std::fixed << std::setprecision(1) << dataModel->getLevel()->timer;
-		fntdominant->draw2D(rd, "Timer: " + stream.str(), Vector2(rd->getWidth() - 120, 25), 20, Color3::fromARGB(0x81C518), Color3::black());
-		fntdominant->draw2D(rd, "Score: " + Convert(dataModel->getLevel()->score), Vector2(rd->getWidth() - 120, 50), 20, Color3::fromARGB(0x81C518), Color3::black());
-		
-		//GUI Boxes	
-		Draw::box(G3D::Box(Vector3(0,25,0),Vector3(80,355,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
-		Draw::box(G3D::Box(Vector3(rd->getWidth() - 120,rd->getHeight() - 120,0),Vector3(rd->getWidth(),rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
-		
-		//Camera menu title
-		fntlighttrek->draw2D(rd, "CameraMenu", Vector2(rd->getWidth()-(fntlighttrek->get2DStringBounds("CameraMenu", 14).x+1),rd->getHeight() - 120), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
-
-		//Tools menu
-		Draw::box(G3D::Box(Vector3(5, 210,0),Vector3(75, 210,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0.6F,0.6F,0.6F,0.4F));
-		fntlighttrek->draw2D(rd,"MENU", Vector2(10,332), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
-
-		
-		drawButtons(rd);
-
-		dataModel->drawMessage(rd);
-		rd->pushState();
-			rd->beforePrimitive();
-
-			if(Globals::showMouse && mouseOnScreen)
-			{
-			glEnable( GL_TEXTURE_2D );
-			glEnable(GL_BLEND);// you enable blending function
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
-			
-			std::vector<Instance*> instances = dataModel->getWorkspace()->getAllChildren();
-			currentcursorid = cursorid;
-			for(size_t i = 0; i < instances.size(); i++)
-			{
-				if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
-				{
-					float time = cameraController.getCamera()->worldRay(dataModel->mousex, dataModel->mousey, renderDevice->getViewport()).intersectionTime(test->getBox());
-					//float time = testRay.intersectionTime(test->getBox());
-					if (time != inf()) 
-					{
-						currentcursorid = cursorOvrid;
-						break;
-					}
-					
-				}
-			}
-			
-			glBindTexture( GL_TEXTURE_2D, currentcursorid);
-
-			
-			glBegin( GL_QUADS );
-			glTexCoord2d(0.0,0.0);
-			glVertex2f(mousepos.x-64, mousepos.y-64);
-			glTexCoord2d( 1.0,0.0 );
-			glVertex2f(mousepos.x+64, mousepos.y-64);
-			glTexCoord2d(1.0,1.0 );
-			glVertex2f(mousepos.x+64, mousepos.y+64 );
-			glTexCoord2d( 0.0,1.0 );
-			glVertex2f( mousepos.x-64, mousepos.y+64 );
-			glEnd();
-
-			glDisable( GL_TEXTURE_2D );
-			}
-
-			rd->afterPrimitive();
-		rd->popState();
-	renderDevice->pop2D();
-}
-
-void Demo::onKeyPressed(int key)
-{
-	if(key==VK_DELETE)
-	{
-		deleteInstance();
-	}
-	if (GetHoldKeyState(VK_RCONTROL))
-	{
-		if (key=='O')
-		{
-			dataModel->getOpen();
-		}
-	}
-}
-void Demo::onKeyUp(int key)
-{
-
-}
-
-void Demo::onMouseLeftPressed(HWND hwnd,int x,int y)
-{
-	//Removed set focus 
-	
-	
-
-
-	std::cout << "Click: " << x << "," << y << std::endl;
-
-	bool onGUI = false;
-	std::vector<Instance*> instances_2D = dataModel->getGuiRoot()->getAllChildren();
-	for(size_t i = 0; i < instances_2D.size(); i++)
-	{
-		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D.at(i)))
-		{
-			if(button->mouseInButton(x,y, renderDevice))
-			{
-				onGUI = true;
-				break;
-			}
-		}
-	}
-	if(!onGUI)
-	{
-		testRay = cameraController.getCamera()->worldRay(dataModel->mousex, dataModel->mousey, renderDevice->getViewport());
-		float nearest=std::numeric_limits<float>::infinity();
-		Vector3 camPos = cameraController.getCamera()->getCoordinateFrame().translation;
-		std::vector<Instance*> instances = dataModel->getWorkspace()->getAllChildren();
-        bool objFound = false;
-		for(size_t i = 0; i < instances.size(); i++)
-		{
-			if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
-			{
-				float time = testRay.intersectionTime(test->getBox());
-				
-				if (time != inf()) 
-				{
-					objFound = true;
-					if (nearest>time)
-					{
-						nearest=time;
-						bool found = false;
-						for(size_t i = 0; i < g_selectedInstances.size(); i++)
-						{
-							if(g_selectedInstances.at(i) == test)
-							{
-								found = true;
-								ShowWindow(_propWindow->_hwndProp, SW_SHOW);
-								SetActiveWindow(_propWindow->_hwndProp);
-								SetForegroundWindow(_propWindow->_hwndProp);
-								break;
-							}
-						}
-						if(!found)
-						{
-							g_selectedInstances.clear();
-							g_selectedInstances.push_back(test);
-						}
-						_propWindow->UpdateSelected(test);
-						//message = "Dragging = true.";
-						//messageTime = System::time();
-						//dragging = true;
-					}
-				}
-			}		
-		}
-		if(!objFound)
-		{
-			g_selectedInstances.clear();
-			g_selectedInstances.push_back(dataModel);
-			_propWindow->UpdateSelected(dataModel);
-			
-		}
-	}
-}
-void Demo::onMouseLeftUp(int x,int y)
-{
-	//std::cout << "Release: " << x << "," << y << std::endl;
-
-	dragging = false;
-	//message = "Dragging = false.";
-	//messageTime = System::time();
-	std::vector<Instance*> instances_2D = dataModel->getGuiRoot()->getAllChildren();
-	//std::vector<Instance*> instances = dataModel->getWorkspace()->getAllChildren();
-	for(size_t i = 0; i < instances_2D.size(); i++)
-	{
-		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D[i]))
-		{
-			if(button->mouseInButton(x, y, renderDevice))
-			{
-				button->onMouseClick();
-			}
-		}
-	}
-}
-void Demo::onMouseRightPressed(int x,int y)
-{
-}
-void Demo::onMouseRightUp(int x,int y)
-{
-}
-void Demo::onMouseMoved(int x,int y)
-{
-	oldMouse = dataModel->getMousePos();
-	dataModel->mousex = x;
-	dataModel->mousey = y;
-
-}
-void Demo::onMouseWheel(int x,int y,short delta)
-{
-	if (mouseOnScreen==true)
-	if (cameraController.onMouseWheel(x, y, delta))
-	{
-		AudioPlayer::playSound(cameraSound);
-	}
-}
-
-/*
-void App::main() {
-	setDebugMode(false);
-	debugController.setActive(false);
-    applet->run();
-}
-*/
-
-/*
-App::App(const GAppSettings& settings, GWindow* wnd,HWND tempMainHWnd, SDLWindow* wndSDL) : GApp(settings, wnd) {
-
-	applet = new Demo(this);
-    hwnd = wndSDL->win32HWND();
-    mainHWnd = tempMainHWnd;
-
-}
-
-App::~App() {
-    delete applet;
-}
-*/
-
-void Boop()
-{
-	OnError(1, "Test");
-}
-
-
 LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	Demo *app = (Demo *)GetWindowLongPtr(hwnd, GWL_USERDATA);
+	Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA);
 	if (app==NULL)
 	{
 		return DefWindowProc(hwnd, msg, wParam, lParam);
@@ -1507,7 +84,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 LRESULT CALLBACK ToolboxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    //Demo *app = (Demo *)GetWindowLongPtr(hwnd, GWL_USERDATA);
+    //Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA);
 	MessageBox(NULL, (LPCSTR)wParam, (LPCSTR)lParam, 1);
 	//if (app==NULL)
 	//{
@@ -1527,7 +104,7 @@ LRESULT CALLBACK ToolboxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    Demo *app = (Demo *)GetWindowLongPtr(hwnd, GWL_USERDATA);
+    Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA);
 	if (app==NULL)
 	{
 		return DefWindowProc(hwnd, msg, wParam, lParam);
@@ -1589,143 +166,9 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
     return 0;
 }
-void Demo::run() {
-	usableApp = this;
-	//setDebugMode(false);
-	//debugController.setActive(false);
-	/*
-	if (!createWindowClass("ToolWindowClass",ToolProc,GetModuleHandle(0)))
-	{
-		return;
-	}
-
-    HWND propertyHWnd = CreateWindowEx(
-    WS_EX_TOOLWINDOW,"ToolWindowClass", "ToolWindow",
-    WS_SYSMENU | WS_VISIBLE | WS_CHILD,
-	0, 0, 800, 64,
-    hWndMain, NULL, GetModuleHandle(0), NULL);
-
-	ShowWindow(propertyHWnd,SW_SHOW);
-	*/
-	UpdateWindow(_hWndMain);
-
-    // Load objects here=
-	cursor = Texture::fromFile(GetFileInPath("/content/images/ArrowCursor.png"));
-	cursorOvr = Texture::fromFile(GetFileInPath("/content/images/DragCursor.png"));
-	Globals::surface = Texture::fromFile(GetFileInPath("/content/images/surfacebr.png"));
-	Globals::surfaceId = Globals::surface->getOpenGLID();
-	fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt"));
-	fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt"));
-	cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav");
-	clickSound = GetFileInPath("/content/sounds/switch.wav");
-	dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav");
-    sky = Sky::create(NULL, ExePath() + "/content/sky/");
-	cursorid = cursor->openGLID();
-	currentcursorid = cursorid;
-	cursorOvrid = cursorOvr->openGLID();
-	RealTime	now=0, lastTime=0;
-	double		simTimeRate = 1.0f;
-	float		fps=30.0f;
-
-	RealTime	desiredFrameDuration=1.0/fps;
-	onInit();
-	RealTime    lastWaitTime=0;
-
-	MSG			messages;
-	//RECT cRect;
-	//GetClientRect(_hWndMain,&cRect);
-	//renderDevice->notifyResize(cRect.right,cRect.bottom);
-	//Rect2D viewportRect = Rect2D::xywh(0,0,cRect.right,cRect.bottom);
-	//renderDevice->setViewport(viewportRect);
-	//window()->setInputCaptureCount(1);
-	resizeWithParent(_hWndMain);
-
-	while (!quit)
-	{
-		
-		lastTime = now;
-		now = System::getTick();
-		RealTime timeStep = now - lastTime;
-		
-		m_userInputWatch.tick();
-			onUserInput(userInput);
-			//m_moduleManager->onUserInput(userInput);
-		m_userInputWatch.tock();
-		
-		m_simulationWatch.tick();
-			//debugController.doSimulation(clamp(timeStep, 0.0, 0.1));
-			//g3dCamera.setCoordinateFrame
-				//(debugController.getCoordinateFrame());
-
-			double rate = simTimeRate;    
-			RealTime rdt = timeStep;
-			SimTime  sdt = timeStep * rate;
-			SimTime  idt = desiredFrameDuration * rate;
-
-			onSimulation(rdt,sdt,idt);
-		m_simulationWatch.tock();
-
-		m_waitWatch.tick();
-		{
-			RealTime now = System::time();
-			// Compute accumulated time
-			System::sleep(max(0.0, desiredFrameDuration - (now - lastWaitTime)));
-			lastWaitTime = System::time();
-		}
-		m_waitWatch.tock();
-
-		m_graphicsWatch.tick();
-			renderDevice->beginFrame();
-				renderDevice->pushState();
-					onGraphics(renderDevice);
-				renderDevice->popState();
-				//renderDebugInfo();
-			renderDevice->endFrame();
-			//debugText.clear();
-		m_graphicsWatch.tock();
-
-		while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
-		{
-			if (IsDialogMessage(_hWndMain, &messages) == 0)
-			{
-				TranslateMessage(&messages);
-				DispatchMessage(&messages);
-			}
-		}
-	}
-	onCleanup();
-}
-void Demo::resizeWithParent(HWND parentWindow)
-{
-	RECT rect;
-	GetClientRect(parentWindow,&rect);
-	SetWindowPos(_hwndRenderer,NULL,0,0,rect.right,rect.bottom-60,SWP_NOMOVE);
-	SetWindowPos(_hwndToolbox,NULL,0,rect.bottom-60,rect.right,60,SWP_NOACTIVATE | SWP_SHOWWINDOW);
-	GetClientRect(_hwndRenderer,&rect);
-	int viewWidth=rect.right;
-	int viewHeight=rect.bottom;
-	renderDevice->notifyResize(viewWidth,viewHeight);
-	Rect2D viewportRect = Rect2D::xywh(0,0,viewWidth,viewHeight);
-	renderDevice->setViewport(viewportRect);
-
-}
-
-void Demo::QuitApp()
-{
-	PostQuitMessage(0);
-	quit=true;
-}
-void Demo::onCreate(HWND parentWindow)
-{
-	//SetWindowLongPtr(hwndRenderer,GWL_USERDATA,(LONG)this);
-	//SetWindowLongPtr(hwndToolbox,GWL_USERDATA,(LONG)this);
-	//SetWindowLongPtr(hwndMain,GWL_USERDATA,(LONG)&demo);
-}
 
 int main(int argc, char** argv) {
-	#ifndef _DEBUG
 	try{
-	#endif
 		hresult = OleInitialize(NULL);
 		if (!AXRegister())
 			return 0;
@@ -1741,19 +184,11 @@ int main(int argc, char** argv) {
 					   ICC_PAGESCROLLER_CLASS|ICC_USEREX_CLASSES*/;
 		InitCommonControlsEx(&icc);
 
-		tempPath = ((std::string)getenv("temp")) + "/"+PlaceholderName;
-		CreateDirectory(tempPath.c_str(), NULL);
-	
-		
-
-		message = tempPath;
-		messageTime = System::time();
 		AudioPlayer::init();
-		GAppSettings settings;
+		/* GAppSettings settings;
 		settings.window.resizable = true;
 		settings.writeLicenseFile = false;
-		settings.logFilename = tempPath + "/g3dlog.txt";
-		settings.window.center = true;
+		settings.window.center = true; */
 		HMODULE hThisInstance = GetModuleHandle(NULL);
 
 		if (!createWindowClass("mainHWND",WndProc,hThisInstance))
@@ -1780,25 +215,18 @@ int main(int argc, char** argv) {
 
 		if(hwndMain == NULL)
 		{
-			MessageBox(NULL, "Failed to create HWND", (PlaceholderName + " Crash").c_str() , MB_OK);
+			MessageBox(NULL, "Failed to create HWND", (g_PlaceholderName + " Crash").c_str() , MB_OK);
 			return 0;
 		}
 		SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE));
 		
 		
-		Demo demo = Demo(settings,hwndMain);
-		demo.run();	
-	#ifndef _DEBUG
+		Application app = Application(hwndMain);
+		app.run();	
 	}
-	
-	catch(std::exception w)
+	catch(...)
 	{
-		//TODO Figure how to save the error to file
-		std::ofstream out("C:\\Dynamica\\error.txt");
-		out << w.what();
-		out.close();
 		OnError(-1);
 	}
-	#endif
     return 0;
 }
diff --git a/win32Defines.h b/win32Defines.h
index 37b27f9..b59019d 100644
--- a/win32Defines.h
+++ b/win32Defines.h
@@ -2,3 +2,4 @@
 
 #include <windows.h>
 #define GetHoldKeyState(nVirtKey) (GetKeyState(nVirtKey)>>1)
+#define GetKPBool(nVirtKey) (GetKeyState(nVirtKey) & 0x8000)