diff --git a/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..919434a62
--- /dev/null
+++ b/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/xcshareddata/polybuild.xcscmblueprint b/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/xcshareddata/polybuild.xcscmblueprint
new file mode 100644
index 000000000..130fd5539
--- /dev/null
+++ b/build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/xcshareddata/polybuild.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93" : 0,
+    "72C5045D78C89EEFD7A049056C14811D40BE1635" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "9C3A538F-B4BA-4880-B18A-0C7CFEACCF8B",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93" : "Polycode\/",
+    "72C5045D78C89EEFD7A049056C14811D40BE1635" : "Polycode\/lib\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "polybuild",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "build\/osx\/polybuild\/polybuild.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ivansafrin\/PolycodeDepBinaries",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "72C5045D78C89EEFD7A049056C14811D40BE1635"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ivansafrin\/Polycode.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/include/polycode/modules/physics3D/PolyCollisionScene.h b/include/polycode/modules/physics3D/PolyCollisionScene.h
index 9b9c5eaed..41d7d9dcb 100644
--- a/include/polycode/modules/physics3D/PolyCollisionScene.h
+++ b/include/polycode/modules/physics3D/PolyCollisionScene.h
@@ -87,7 +87,7 @@ struct CollisionResult {
 			/**
 			* Creates a collision scene.
 			*/
-			CollisionScene(Vector3 size = Vector3(2000), bool virtualScene = false, bool deferInitCollision = false);		
+			CollisionScene(Core* core, Vector3 size = Vector3(2000), bool deferInitCollision = false);
 			virtual ~CollisionScene();
 		
 			void initCollisionScene(Vector3 size);
diff --git a/include/polycode/modules/physics3D/PolyPhysicsScene.h b/include/polycode/modules/physics3D/PolyPhysicsScene.h
index 63d905b67..b876d2b27 100644
--- a/include/polycode/modules/physics3D/PolyPhysicsScene.h
+++ b/include/polycode/modules/physics3D/PolyPhysicsScene.h
@@ -96,7 +96,7 @@ namespace Polycode {
 		/**
 		* Main constructor.
 		*/
-		PhysicsScene(int maxSubSteps = 0, Vector3 size = Vector3(200), bool virtualScene = false);
+		PhysicsScene(Core* core, int maxSubSteps = 0, Vector3 size = Vector3(200));
 		virtual ~PhysicsScene();	
 		
 		void fixedUpdate();
diff --git a/src/ide/PolycodeEntityEditor.cpp b/src/ide/PolycodeEntityEditor.cpp
index 5e6eb2dfe..890c1a9a4 100644
--- a/src/ide/PolycodeEntityEditor.cpp
+++ b/src/ide/PolycodeEntityEditor.cpp
@@ -2147,7 +2147,7 @@ PolycodeEntityEditor::~PolycodeEntityEditor() {
 bool PolycodeEntityEditor::openFile(OSFileEntry filePath) { 
 	PolycodeEditor::openFile(filePath);
 //	  return true;
-	loadedInstance = new SceneEntityInstance(core, filePath.fullPath);
+	loadedInstance = new SceneEntityInstance(core, mainView->getMainScene(), filePath.fullPath);
 	
 	// disable sounds :)
 	for(int i=0; i < loadedInstance->getNumChildren(); i++) {
diff --git a/src/modules/physics3D/PolyCollisionScene.cpp b/src/modules/physics3D/PolyCollisionScene.cpp
index b6d546253..510debc69 100644
--- a/src/modules/physics3D/PolyCollisionScene.cpp
+++ b/src/modules/physics3D/PolyCollisionScene.cpp
@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 using namespace Polycode;
 
-CollisionScene::CollisionScene(Vector3 size, bool virtualScene, bool deferInitCollision) : Scene(Scene::SCENE_3D, virtualScene), world(NULL), collisionConfiguration(NULL), dispatcher(NULL), axisSweep(NULL) {
+CollisionScene::CollisionScene(Core* core, Vector3 size, bool deferInitCollision) : Scene(core, Scene::SCENE_3D), world(NULL), collisionConfiguration(NULL), dispatcher(NULL), axisSweep(NULL) {
 	if(!deferInitCollision) {
 		initCollisionScene(size);
 	}
diff --git a/src/modules/physics3D/PolyPhysicsScene.cpp b/src/modules/physics3D/PolyPhysicsScene.cpp
index 43aa82dd4..1ad2a038c 100644
--- a/src/modules/physics3D/PolyPhysicsScene.cpp
+++ b/src/modules/physics3D/PolyPhysicsScene.cpp
@@ -28,7 +28,6 @@ THE SOFTWARE.
 #include "polycode/modules/physics3D/PolyCollisionScene.h"
 #include "polycode/modules/physics3D/PolyPhysicsSceneEntity.h"
 
-#include "polycode/core/PolyCoreServices.h"
 #include "polycode/core/PolyVector3.h"
 #include "polycode/core/PolyCore.h"
 
@@ -47,7 +46,7 @@ PhysicsSceneEvent::~PhysicsSceneEvent() {
 }
 
 
-PhysicsScene::PhysicsScene(int maxSubSteps, Vector3 size, bool virtualScene) : CollisionScene(size, virtualScene, true), physicsWorld(NULL), solver(NULL), broadphase(NULL), ghostPairCallback(NULL) {
+PhysicsScene::PhysicsScene(Core* core, int maxSubSteps, Vector3 size) : CollisionScene(core, size, true), physicsWorld(NULL), solver(NULL), broadphase(NULL), ghostPairCallback(NULL) {
 	this->maxSubSteps = maxSubSteps;
 	pausePhysics = false;	
 	initPhysicsScene(size);