From b28b1bc99b9f15e0df0c4710dacd18be1b7c23c4 Mon Sep 17 00:00:00 2001
From: cybafelo <theunis.botha1@gmail.com>
Date: Thu, 25 Jul 2019 22:22:32 +0200
Subject: [PATCH] restructuring

---
 gulpfile.js                                   |  32 +-
 src/r3-a-2-utils.js                           |  19 +-
 ...a-4-component-a.js => r3-a-4-component.js} | 245 +++++++++--
 src/r3-api-clock.js                           |   2 +-
 src/r3-api-controls-0.js                      |   2 +-
 src/{r3-api-curve-a.js => r3-api-curve-0.js}  |   2 +-
 src/r3-api-custom-code.js                     |   2 +-
 src/r3-api-dom-element.js                     |   2 +-
 src/r3-api-draw-range.js                      |   2 +-
 src/r3-api-entity-manager.js                  |   2 +-
 src/r3-api-entity.js                          |   2 +-
 src/r3-api-group.js                           |   2 +-
 src/r3-api-gui.js                             |   2 +-
 src/r3-api-image.js                           |   2 +-
 src/r3-api-mouse.js                           |   2 +-
 src/r3-api-plane.js                           |   2 +-
 src/r3-api-project.js                         |   9 +-
 src/r3-api-renderer-a.js                      |   2 +-
 src/r3-api-server.js                          |   2 +-
 src/r3-api-socket-0.js                        |   2 +-
 src/r3-api-sphere.js                          |   2 +-
 src/r3-api-stats.js                           |   2 +-
 src/r3-api-user.js                            |   2 +-
 src/r3-api-video.js                           |   2 +-
 src/r3-box3.js                                |  55 +--
 src/r3-canvas.js                              |  85 ++--
 src/r3-clock.js                               |  71 +--
 src/r3-coder-runtime.js                       |  60 ---
 src/r3-color.js                               |  72 ++--
 src/r3-controls-0.js                          |  82 +---
 src/r3-controls-d3-editor.js                  |  98 +----
 src/r3-controls-d3-first-person.js            | 158 ++-----
 src/r3-controls-d3-orbit.js                   | 180 +++-----
 src/r3-controls-d3.js                         |  37 ++
 src/r3-controls-keyboard.js                   |  51 +--
 src/r3-controls-mouse.js                      |  51 +--
 src/r3-controls-touch.js                      |  54 +--
 src/r3-curve-a.js                             |  92 ++--
 src/r3-curve-path-a.js                        | 121 +++---
 src/r3-curve-path-d2-a.js                     | 111 +++--
 src/r3-curve-path-d2-shape.js                 |  79 ++--
 src/r3-custom-code.js                         |  54 +--
 ...-api-a-object.js => r3-d3-api-0-object.js} |   2 +-
 src/r3-d3-api-animation.js                    |   2 +-
 src/r3-d3-api-audio.js                        |  19 +-
 src/r3-d3-api-bone-weight.js                  |  21 +-
 src/r3-d3-api-broadphase.js                   |   2 +-
 src/r3-d3-api-camera-cube.js                  |   2 +-
 src/r3-d3-api-composer.js                     |   2 +-
 src/r3-d3-api-effect-a.js                     |   2 +-
 src/r3-d3-api-face.js                         |   2 +-
 src/r3-d3-api-fog.js                          |   2 +-
 src/r3-d3-api-font.js                         |   2 +-
 src/r3-d3-api-friction-contact-material.js    |   2 +-
 src/r3-d3-api-friction-material.js            |   2 +-
 src/r3-d3-api-geometry-a.js                   |   2 +-
 src/r3-d3-api-geometry-buffer-box.js          |   2 +-
 src/r3-d3-api-geometry-buffer-circle.js       |   2 +-
 src/r3-d3-api-geometry-buffer-cone.js         |   2 +-
 src/r3-d3-api-geometry-buffer-cylinder.js     |   2 +-
 src/r3-d3-api-geometry-buffer-dodecahedron.js |   2 +-
 src/r3-d3-api-geometry-buffer-extrude.js      |   2 +-
 src/r3-d3-api-geometry-buffer-icosahedron.js  |   2 +-
 src/r3-d3-api-geometry-buffer-instanced.js    |   2 +-
 src/r3-d3-api-geometry-buffer-lathe.js        |   2 +-
 src/r3-d3-api-geometry-buffer-octahedron.js   |   2 +-
 src/r3-d3-api-geometry-buffer-parametric.js   |   2 +-
 src/r3-d3-api-geometry-buffer-plane.js        |   2 +-
 src/r3-d3-api-geometry-buffer-polyhedron.js   |   2 +-
 src/r3-d3-api-geometry-buffer-ring.js         |   2 +-
 src/r3-d3-api-geometry-buffer-shape.js        |   2 +-
 src/r3-d3-api-geometry-buffer-sphere.js       |   2 +-
 src/r3-d3-api-geometry-buffer-tetrahedron.js  |   2 +-
 src/r3-d3-api-geometry-buffer-text.js         |   2 +-
 src/r3-d3-api-geometry-buffer-torus-knot.js   |   2 +-
 src/r3-d3-api-geometry-buffer-torus.js        |   2 +-
 src/r3-d3-api-geometry-buffer-tube.js         |   2 +-
 src/r3-d3-api-geometry-normal-box.js          |   2 +-
 src/r3-d3-api-geometry-normal-circle.js       |   2 +-
 src/r3-d3-api-geometry-normal-cone.js         |   2 +-
 src/r3-d3-api-geometry-normal-cylinder.js     |   2 +-
 src/r3-d3-api-geometry-normal-dodecahedron.js |   2 +-
 src/r3-d3-api-geometry-normal-edges.js        |   2 +-
 src/r3-d3-api-geometry-normal-extrude.js      |   2 +-
 src/r3-d3-api-geometry-normal-icosahedron.js  |   2 +-
 src/r3-d3-api-geometry-normal-lathe.js        |   2 +-
 src/r3-d3-api-geometry-normal-octahedron.js   |   2 +-
 src/r3-d3-api-geometry-normal-parametric.js   |   2 +-
 src/r3-d3-api-geometry-normal-plane.js        |   2 +-
 src/r3-d3-api-geometry-normal-polyhedron.js   |   2 +-
 src/r3-d3-api-geometry-normal-ring.js         |   2 +-
 src/r3-d3-api-geometry-normal-shape.js        |   2 +-
 src/r3-d3-api-geometry-normal-sphere.js       |   2 +-
 src/r3-d3-api-geometry-normal-tetrahedron.js  |   2 +-
 src/r3-d3-api-geometry-normal-text.js         |   2 +-
 src/r3-d3-api-geometry-normal-torus-knot.js   |   2 +-
 src/r3-d3-api-geometry-normal-torus.js        |   2 +-
 src/r3-d3-api-geometry-normal-tube.js         |   2 +-
 src/r3-d3-api-geometry-normal-wireframe.js    |   2 +-
 src/r3-d3-api-light-a.js                      |   2 +-
 src/r3-d3-api-material-a.js                   |   2 +-
 src/r3-d3-api-material-basic.js               |   2 +-
 src/r3-d3-api-material-phong.js               |   2 +-
 src/r3-d3-api-material-points.js              |   2 +-
 src/r3-d3-api-material-shader-a.js            |   2 +-
 src/r3-d3-api-material-standard.js            |   2 +-
 src/r3-d3-api-particle.js                     |   2 +-
 src/r3-d3-api-pass-0.js                       |   2 +-
 src/r3-d3-api-physics-world.js                |   2 +-
 src/r3-d3-api-raycast-vehicle.js              |   2 +-
 src/r3-d3-api-raycast-wheel.js                |   2 +-
 src/r3-d3-api-raycaster.js                    |   2 +-
 src/r3-d3-api-render-target-a.js              |  23 +-
 src/r3-d3-api-render-target-cube.js           |  10 +-
 src/r3-d3-api-rigid-body.js                   |   2 +-
 src/r3-d3-api-scene.js                        |   2 +-
 src/r3-d3-api-shader-a.js                     |   2 +-
 src/r3-d3-api-shadow-a.js                     |   2 +-
 src/r3-d3-api-shape.js                        |   2 +-
 src/r3-d3-api-skeleton.js                     |   2 +-
 src/r3-d3-api-solver.js                       |   2 +-
 src/r3-d3-api-spline.js                       |   2 +-
 src/r3-d3-api-text.js                         |   2 +-
 src/r3-d3-api-texture-canvas.js               |   2 +-
 src/r3-d3-api-texture-cube.js                 |   2 +-
 src/r3-d3-api-texture-image.js                |   2 +-
 src/r3-d3-api-texture.js                      |   4 +-
 src/r3-d3-api-viewport.js                     |   2 +-
 src/r3-d3-api-y-object.js                     | 245 +++++++++++
 src/r3-d3-api-z-animation.js                  | 115 +----
 src/r3-d3-api-z-object.js                     | 340 ---------------
 src/r3-d3-audio.js                            | 157 +++----
 src/r3-d3-bone-weight.js                      |  60 ++-
 src/r3-d3-bone.js                             |  53 +--
 src/r3-d3-broadphase.js                       |  97 +----
 src/r3-d3-camera-a.js                         |  99 +----
 src/r3-d3-camera-cube.js                      | 138 ++----
 src/r3-d3-camera-orthographic-fixed-aspect.js |   2 +-
 ...r3-d3-camera-orthographic-zoomed-aspect.js |   2 +-
 src/r3-d3-camera-orthographic.js              |   2 +-
 src/r3-d3-camera-perspective-stereo.js        |   4 +-
 src/r3-d3-camera-perspective.js               |   2 +-
 src/r3-d3-composer.js                         |   2 +-
 src/r3-d3-effect-a.js                         |   2 +-
 src/r3-d3-effect-anaglyph.js                  |   2 +-
 src/r3-d3-effect-parallax.js                  |   2 +-
 src/r3-d3-effect-stereo.js                    |   2 +-
 src/r3-d3-face.js                             |   6 +-
 src/r3-d3-font.js                             |   4 +-
 src/r3-d3-friction-contact-material.js        |   2 +-
 src/r3-d3-friction-material.js                |   2 +-
 src/r3-d3-geometry-buffer-box.js              |   2 +-
 src/r3-d3-geometry-buffer-circle.js           |   2 +-
 src/r3-d3-geometry-buffer-cone.js             |   2 +-
 src/r3-d3-geometry-buffer-cylinder.js         |   2 +-
 src/r3-d3-geometry-buffer-dodecahedron.js     |   2 +-
 src/r3-d3-geometry-buffer-extrude.js          |   2 +-
 src/r3-d3-geometry-buffer-icosahedron.js      |   2 +-
 src/r3-d3-geometry-buffer-instanced.js        |   2 +-
 src/r3-d3-geometry-buffer-lathe.js            |   2 +-
 src/r3-d3-geometry-buffer-octahedron.js       |   2 +-
 src/r3-d3-geometry-buffer-parametric.js       |   2 +-
 src/r3-d3-geometry-buffer-plane.js            |   2 +-
 src/r3-d3-geometry-buffer-polyhedron.js       |   2 +-
 src/r3-d3-geometry-buffer-ring.js             |   2 +-
 src/r3-d3-geometry-buffer-shape.js            |   2 +-
 src/r3-d3-geometry-buffer-sphere.js           |   2 +-
 src/r3-d3-geometry-buffer-tetrahedron.js      |   2 +-
 src/r3-d3-geometry-buffer-text.js             |   2 +-
 src/r3-d3-geometry-buffer-torus-knot.js       |   2 +-
 src/r3-d3-geometry-buffer-torus.js            |   2 +-
 src/r3-d3-geometry-buffer-tube.js             |   2 +-
 src/r3-d3-geometry-normal-box.js              |   2 +-
 src/r3-d3-geometry-normal-circle.js           |   2 +-
 src/r3-d3-geometry-normal-cone.js             |   2 +-
 src/r3-d3-geometry-normal-cylinder.js         |   2 +-
 src/r3-d3-geometry-normal-dodecahedron.js     |   2 +-
 src/r3-d3-geometry-normal-edges.js            |   2 +-
 src/r3-d3-geometry-normal-extrude.js          |   2 +-
 src/r3-d3-geometry-normal-icosahedron.js      |   2 +-
 src/r3-d3-geometry-normal-lathe.js            |   2 +-
 src/r3-d3-geometry-normal-octahedron.js       |   2 +-
 src/r3-d3-geometry-normal-parametric.js       |   2 +-
 src/r3-d3-geometry-normal-plane.js            |   2 +-
 src/r3-d3-geometry-normal-polyhedron.js       |   2 +-
 src/r3-d3-geometry-normal-ring.js             |   2 +-
 src/r3-d3-geometry-normal-shape.js            |   2 +-
 src/r3-d3-geometry-normal-sphere.js           |   2 +-
 src/r3-d3-geometry-normal-tetrahedron.js      |   2 +-
 src/r3-d3-geometry-normal-text.js             |   2 +-
 src/r3-d3-geometry-normal-torus-knot.js       |   2 +-
 src/r3-d3-geometry-normal-torus.js            |   2 +-
 src/r3-d3-geometry-normal-tube.js             |   2 +-
 src/r3-d3-geometry-normal-wireframe.js        |   2 +-
 src/r3-d3-helper.js                           |   2 +-
 src/r3-d3-light-a.js                          |   2 +-
 src/r3-d3-light-ambient.js                    |   2 +-
 src/r3-d3-light-directional.js                |   2 +-
 src/r3-d3-light-hemisphere.js                 |   2 +-
 src/r3-d3-light-point.js                      |   2 +-
 src/r3-d3-light-rect-area.js                  |   2 +-
 src/r3-d3-light-spot.js                       |   2 +-
 src/r3-d3-material-a.js                       |   2 +-
 src/r3-d3-mesh-0.js                           |  12 +-
 src/r3-d3-particle-engine.js                  |   2 +-
 src/r3-d3-particle.js                         |   2 +-
 src/r3-d3-pass-0.js                           |   2 +-
 src/r3-d3-pass-bloom.js                       |   2 +-
 src/r3-d3-pass-fxaa.js                        |   2 +-
 src/r3-d3-pass-render.js                      |   2 +-
 src/r3-d3-pass-ssao.js                        |   2 +-
 src/r3-d3-physics-world.js                    |   8 +-
 src/r3-d3-raycast-vehicle.js                  |   2 +-
 src/r3-d3-raycast-wheel.js                    |   2 +-
 src/r3-d3-raycaster.js                        |   2 +-
 src/r3-d3-render-target-a.js                  | 324 ++++----------
 src/r3-d3-render-target-cube.js               |   2 +-
 src/r3-d3-rigid-body.js                       |   2 +-
 src/r3-d3-shader-a.js                         |   2 +-
 src/r3-d3-shader-fragment.js                  |   2 +-
 src/r3-d3-shader-vertex.js                    |   2 +-
 src/r3-d3-shadow-a.js                         |   2 +-
 src/r3-d3-shadow-directional.js               |   2 +-
 src/r3-d3-shadow-spot.js                      |   2 +-
 src/r3-d3-shape-0.js                          |   4 +-
 src/r3-d3-skeleton.js                         |   4 +-
 src/r3-d3-solver.js                           |   2 +-
 src/r3-d3-spline.js                           |   4 +-
 src/r3-d3-texture-a.js                        |   2 +-
 src/r3-d3-viewport.js                         |   2 +-
 src/r3-graphics-runtime-a.js                  |  40 --
 src/r3-graphics-runtime-three.js              |  84 ----
 src/r3-gui-runtime.js                         |  59 ---
 src/r3-gui.js                                 |   2 +-
 src/r3-physics-runtime-cannon.js              |  38 --
 src/r3-physics-runtime.js                     |  35 --
 src/r3-plane.js                               |   4 +-
 src/r3-renderer-d3-canvas-target.js           |   2 +-
 src/r3-renderer-d3-canvas.js                  |   2 +-
 src/r3-renderer-d3-target.js                  |   2 +-
 src/r3-renderer-d3.js                         |   2 +-
 src/r3-runtime-coder-codemirror.js            |  19 +
 src/r3-runtime-coder.js                       |  11 +
 src/r3-runtime-graphics-three.js              | 408 ++++++++++++++++++
 src/r3-runtime-graphics.js                    | 107 +++++
 src/r3-runtime-gui-datgui.js                  |  19 +
 src/r3-runtime-gui.js                         |  12 +
 src/r3-runtime-physics-cannon.js              |  60 +++
 src/r3-runtime-physics.js                     |  40 ++
 src/r3-runtime-sockets-websockjet.js          |  24 ++
 src/r3-runtime-sockets.js                     |  16 +
 src/r3-runtime-statistics-stats.js            |  21 +
 src/r3-runtime-statistics.js                  |  12 +
 src/r3-runtime.js                             |  10 +
 src/r3-sockets-runtime.js                     |  66 ---
 src/r3-statistics-runtime.js                  |  59 ---
 src/r3-stats.js                               |   2 +-
 src/r3-system-gui.js                          |  12 +-
 258 files changed, 2274 insertions(+), 2831 deletions(-)
 rename src/{r3-a-4-component-a.js => r3-a-4-component.js} (93%)
 rename src/{r3-api-curve-a.js => r3-api-curve-0.js} (93%)
 delete mode 100644 src/r3-coder-runtime.js
 create mode 100644 src/r3-controls-d3.js
 rename src/{r3-d3-api-a-object.js => r3-d3-api-0-object.js} (97%)
 create mode 100644 src/r3-d3-api-y-object.js
 delete mode 100644 src/r3-d3-api-z-object.js
 delete mode 100644 src/r3-graphics-runtime-a.js
 delete mode 100644 src/r3-graphics-runtime-three.js
 delete mode 100644 src/r3-gui-runtime.js
 delete mode 100644 src/r3-physics-runtime-cannon.js
 delete mode 100644 src/r3-physics-runtime.js
 create mode 100644 src/r3-runtime-coder-codemirror.js
 create mode 100644 src/r3-runtime-coder.js
 create mode 100644 src/r3-runtime-graphics-three.js
 create mode 100644 src/r3-runtime-graphics.js
 create mode 100644 src/r3-runtime-gui-datgui.js
 create mode 100644 src/r3-runtime-gui.js
 create mode 100644 src/r3-runtime-physics-cannon.js
 create mode 100644 src/r3-runtime-physics.js
 create mode 100644 src/r3-runtime-sockets-websockjet.js
 create mode 100644 src/r3-runtime-sockets.js
 create mode 100644 src/r3-runtime-statistics-stats.js
 create mode 100644 src/r3-runtime-statistics.js
 create mode 100644 src/r3-runtime.js
 delete mode 100644 src/r3-sockets-runtime.js
 delete mode 100644 src/r3-statistics-runtime.js

diff --git a/gulpfile.js b/gulpfile.js
index 19d2147..70b3336 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,7 +17,7 @@ code	+= '\t\tthis,\n';
 code	+= '\t\tthis.apiComponent.parent,\n';
 code	+= '\t\tthis.apiComponent.id,\n';
 code	+= '\t\tthis.apiComponent.name\n';
-code	+= '\t);';
+code	+= '\t)';
 
 var code2 = 'if (R3.Utils.UndefinedOrNull(apiGeometryBuffer)) {\n';
 code2	+= '\t\tapiGeometryBuffer = {};\n';
@@ -32,7 +32,7 @@ code2	+= '\t\tthis.apiGeometryBuffer.drawRange,\n';
 code2	+= '\t\tthis.apiGeometryBuffer.groups,\n';
 code2	+= '\t\tthis.apiGeometryBuffer.index,\n';
 code2	+= '\t\tthis.apiGeometryBuffer.morphAttributes\n';
-code2	+= '\t);';
+code2	+= '\t)';
 
 var code3 = 'if (R3.Utils.UndefinedOrNull(apiGeometryNormal)) {\n';
 code3	+= '\t\tapiGeometryNormal = {};\n';
@@ -55,7 +55,7 @@ code3	+= '\t\tthis.apiGeometryNormal.normalsNeedUpdate,\n';
 code3	+= '\t\tthis.apiGeometryNormal.colorsNeedUpdate,\n';
 code3	+= '\t\tthis.apiGeometryNormal.groupsNeedUpdate,\n';
 code3	+= '\t\tthis.apiGeometryNormal.lineDistancesNeedUpdate\n';
-code3	+= '\t);';
+code3	+= '\t)';
 
 var code4 = 'if (R3.Utils.UndefinedOrNull(apiMaterial)) {\n';
 code4	+= '\t\tapiMaterial = {};\n';
@@ -99,7 +99,7 @@ code4	+= '\t\tthis.apiMaterial.side,\n';
 code4	+= '\t\tthis.apiMaterial.transparent,\n';
 code4	+= '\t\tthis.apiMaterial.vertexColors,\n';
 code4	+= '\t\tthis.apiMaterial.visible\n';
-code4	+= '\t);';
+code4	+= '\t)';
 
 var code5 = 'if (R3.Utils.UndefinedOrNull(apiTexture)) {\n';
 code5	+= '\t\tapiTexture = {};\n';
@@ -133,7 +133,28 @@ code5	+= '\t\tthis.apiTexture.version,\n';
 code5	+= '\t\tthis.apiTexture.animated,\n';
 code5	+= '\t\tthis.apiTexture.reverseAnimation,\n';
 code5	+= '\t\tthis.apiTexture.forward\n';
-code5	+= '\t);';
+code5	+= '\t)';
+
+var code6 = 'if (R3.Utils.UndefinedOrNull(apiComponent)) {\n';
+code6	+= '\t\tapiComponent = {};\n';
+code6	+= '\t}\n';
+code6	+= '\tthis.apiComponent = apiComponent;\n';
+code6	+= '\n';
+code6	+= '\tthis.graphics\t= null;\n';
+code6	+= '\tthis.physics\t= null;\n';
+code6	+= '\tthis.gui\t\t= null;\n';
+code6	+= '\tthis.stats\t\t= null;\n';
+code6	+= '\n';
+code6	+= '\tR3.Event.Emit(\n';
+code6	+= '\t\tR3.Event.GET_RUNTIME,\n';
+code6	+= '\t\tfunction(runtime) {\n';
+code6	+= '\t\t\tthis.graphics\t= runtime.graphics;\n';
+code6	+= '\t\t\tthis.physics\t= runtime.physics;\n';
+code6	+= '\t\t\tthis.coder\t= runtime.coder;\n';
+code6	+= '\t\t\tthis.gui\t\t= runtime.gui;\n';
+code6	+= '\t\t\tthis.stats\t\t= runtime.stats;\n';
+code6	+= '\t\t}.bind(this)\n';
+code6	+= '\t)';
 
 function build() {
     return gulp.src('./src/r3-*.js')
@@ -145,6 +166,7 @@ function build() {
         .pipe(replace('__API_GEOMETRY_NORMAL_MACRO__', code3))
         .pipe(replace('__API_MATERIAL_MACRO__', code4))
         .pipe(replace('__API_TEXTURE_MACRO__', code5))
+        .pipe(replace('__RUNTIME_COMPONENT_MACRO__', code6))
         .pipe(minify({
             ext:{
                 src:'.js',
diff --git a/src/r3-a-2-utils.js b/src/r3-a-2-utils.js
index 6f5281b..9354f09 100644
--- a/src/r3-a-2-utils.js
+++ b/src/r3-a-2-utils.js
@@ -862,37 +862,37 @@ R3.Utils.IsEmpty = function(obj) {
     return (Object.keys(obj).length === 0 && obj.constructor === Object);
 };
 
-R3.Utils.isString = function(member) {
+R3.Utils.IsString = function(member) {
 	return (typeof member === 'string');
 };
 
-R3.Utils.isBoolean = function(member) {
+R3.Utils.IsBoolean = function(member) {
 	return (member === true || member === false);
 };
 
-R3.Utils.isColor = function(member) {
+R3.Utils.IsColor = function(member) {
 	return (member instanceof R3.Color);
 };
 
-R3.Utils.isNumber = function(member) {
+R3.Utils.IsNumber = function(member) {
 	return (typeof member === 'number');
 };
 
-R3.Utils.isVector2 = function(member) {
+R3.Utils.IsVector2 = function(member) {
 	return (
 	    member instanceof R3.API.Vector2 ||
 	    member instanceof R3.Vector2
     );
 };
 
-R3.Utils.isVector3 = function(member) {
+R3.Utils.IsVector3 = function(member) {
 	return (
 	    member instanceof R3.API.Vector3 ||
 	    member instanceof R3.Vector3
     );
 };
 
-R3.Utils.isVector4 = function(member) {
+R3.Utils.IsVector4 = function(member) {
 	return (
 	    member instanceof R3.API.Vector4 ||
 	    member instanceof R3.Vector4 ||
@@ -901,6 +901,11 @@ R3.Utils.isVector4 = function(member) {
     );
 };
 
+R3.Utils.IsObject = function(member) {
+    var type = typeof member;
+    return type === 'function' || type === 'object' && !!member;
+};
+
 /**
  * @return {string}
  */
diff --git a/src/r3-a-4-component-a.js b/src/r3-a-4-component.js
similarity index 93%
rename from src/r3-a-4-component-a.js
rename to src/r3-a-4-component.js
index c8204bf..5b4784b 100644
--- a/src/r3-a-4-component-a.js
+++ b/src/r3-a-4-component.js
@@ -1,28 +1,33 @@
 /**
- * Component Interface
- * @constructor
- * @param linkedObjects
+ * R3.Component is an R3.Event
  * @param parent
+ * @param linkedObjects
+ * @constructor
  */
 R3.Component = function(
 	parent,
     linkedObjects
 ) {
-    /**
-     * Call the Event constructor first so we can set the parent right away
-     */
-    R3.Event.call(
-        this,
-        parent
-    );
-
-    this.componentType = this.getComponentType();
+    if (R3.Utils.UndefinedOrNull(parent)) {
+        parent = null;
+    }
+    this.parent = parent;
 
     if (R3.Utils.UndefinedOrNull(linkedObjects)) {
         linkedObjects = {};
     }
     this.linkedObjects = linkedObjects;
 
+    /**
+     * Call the Event constructor first so we can set the parent right away
+     */
+    R3.Event.call(
+        this,
+        this.parent
+    );
+
+    this.componentType = this.getComponentType();
+
 	this.idToObject = {};
 
     this.selected = false;
@@ -200,29 +205,78 @@ R3.Component.prototype.getDependencies = function() {
 };
 
 R3.Component.prototype.updateInstance = function(property) {
-    console.warn('TODO: update instance for parent change');
 
-    //
-    // if (property === 'parent') {
-    //
-    //     if (this.parent instanceof R3.Entity) {
-    //         this.parent.addComponent(this);
-    //
-    //         this.buildIdToObject();
-    //
-    //         Object.keys(this.idToObject).map(
-    //             function(componentId) {
-    //
-    //                 if (this.id !== componentId) {
-    //                     this.parent.addComponent(this.idToObject[componentId]);
-    //                 }
-    //
-    //             }.bind(this)
-    //         )
-    //     }
-    //
-    // }
+    if (property === 'id') {
+        console.warn('TODO: update id');
+        return;
+    }
 
+    if (property === 'name') {
+        console.warn('TODO: update name');
+        return;
+    }
+
+    if (property === 'parent') {
+        console.warn('TODO: update parent');
+        return;
+    }
+
+};
+
+/**
+ * R3.Component.prototype.updateFromInstance
+ *
+ *  - Updates the component by its instance data
+ *
+ * @param property
+ */
+R3.Component.prototype.updateFromInstance = function(property) {
+
+    if (
+        this[property] instanceof R3.Color
+    ) {
+        this[property].r = this.instance[property].r;
+        this[property].g = this.instance[property].g;
+        this[property].b = this.instance[property].b;
+        this[property].a = this.instance[property].a;
+    }
+
+    if (
+        this[property] instanceof R3.Vector2
+    ) {
+        this[property].x = this.instance[property].x;
+        this[property].y = this.instance[property].y;
+    }
+
+    if (
+        this[property] instanceof R3.Vector3
+    ) {
+        this[property].x = this.instance[property].x;
+        this[property].y = this.instance[property].y;
+        this[property].z = this.instance[property].z;
+    }
+
+    if (
+        this[property] instanceof R3.Vector4 |
+        this[property] instanceof R3.Quaternion
+    ) {
+        this[property].x = this.instance[property].x;
+        this[property].y = this.instance[property].y;
+        this[property].z = this.instance[property].z;
+        this[property].w = this.instance[property].w;
+    }
+
+    if (
+        this[property] instanceof R3.Matrix4
+    ) {
+        throw new Error('TODO : implement this code - no use case yet');
+    }
+
+    if (R3.Utils.IsObject(this[property])) {
+        throw new Error('TODO : update component object from instance object');
+    }
+
+    this[property] = this.instance[property];
 };
 
 /**
@@ -261,6 +315,28 @@ R3.Component.prototype.getParent = function(property, constructor) {
 
 };
 
+/**
+ * This function traverses the parent chain to find the first parent which matches the constructor
+ * @param constructor
+ */
+R3.Component.prototype.getFirstParent = function(constructor) {
+
+    if (R3.Utils.UndefinedOrNull(constructor)) {
+        throw new Error('You need to specify a constructor');
+    }
+
+    if (this.parent === null) {
+        return null;
+    }
+
+    if (this.parent instanceof constructor) {
+        return this.parent;
+    } else {
+        return this.getFirstParent(constructor);
+    }
+
+};
+
 R3.Component.prototype.toString = function() {
 	return this.id;
 };
@@ -573,9 +649,9 @@ R3.Component.GetComponentInfo = function(number) {
             apiConstructor : R3.API.System
         };
         case 0x14 : return {
-            name : 'R3.GraphicsRuntime',
+            name : 'R3.Runtime.Graphics',
             runtime : R3.Component.DEFAULT_RUNTIME,
-            constructor : R3.GraphicsRuntime
+            constructor : R3.Runtime.Graphics
         };
         case 0x15 : return {
             name : 'R3.D3.Helper',
@@ -1944,7 +2020,7 @@ R3.Component.prototype.getComponentType = function() {
     if (this instanceof R3.GUI) {
         return R3.Component.GUI;
     }
-    if (this instanceof R3.GUIRuntime) {
+    if (this instanceof R3.Runtime.GUI) {
         return R3.Component.GUI_RUNTIME;
     }
     if (this instanceof R3.Image) {
@@ -2017,6 +2093,39 @@ R3.Component.GetComponentConstructor = function(componentType) {
     return null;
 };
 
+R3.Component.prototype.getPropertyValue = function(item) {
+
+    /**
+     * We found data that we need to process - here we have to pay attention.
+     * For linked objects - we only store the ID
+     */
+    if (item instanceof R3.Component) {
+        return R3.Utils.IdOrNull(item);
+    }
+
+    /**
+     * Handle colors, vectors and matrices - they are not components so they have their own toApiObject functions
+     */
+    if (
+        item instanceof R3.Color        |
+        item instanceof R3.Vector2      |
+        item instanceof R3.Vector3      |
+        item instanceof R3.Vector4      |
+        item instanceof R3.Quaternion   |
+        item instanceof R3.Matrix4
+    ) {
+        return item.toApiObject();
+    }
+
+    /**
+     * If we get to this point and we still have an Object - we throw an error
+     */
+    if (R3.Utils.IsObject(item)) {
+        throw new Error('We still have an object here which is trying to get saved: ' + item);
+    }
+
+    return item;
+};
 
 /**
  * Components are linked at runtime - for storing, we just store the ID
@@ -2028,15 +2137,65 @@ R3.Component.prototype.toApiObject = function() {
 
     var apiConstructor = info.apiConstructor;
 
-    console.warn('implement generic component toApiObject');
+    var apiObject = new apiConstructor();
 
-    var parameters = R3.Utils.GetParameters(apiConstructor);
+    for (var property in apiObject) {
+        if (apiObject.hasOwnProperty(property)) {
 
-    throw new Error(parameters);
+            /**
+             * Check if the current component also has this property
+             */
+            if (this.hasOwnProperty(property)) {
 
-    return this.id;
-    // return new info.apiConstructor()
+                if (this[property] instanceof R3.Runtime) {
 
+                    /**
+                     * Check if this is a runtime object - we ignore those
+                     */
+                    continue;
+                }
+
+                /**
+                 * Check if this property is an array of something
+                 */
+                if (this[property].isArray) {
+
+                    /**
+                     * Quick sanity check that the apiObject also thinks this is an array
+                     */
+                    if (!arrayObject[property].isArray) {
+                        throw new Error('The API Object ' + apiObject + ' does not seem to think ' + property + ' is an array');
+                    }
+
+                    /**
+                     * Loop through the array - assign the contents of
+                     * the array to the apiObject
+                     */
+                    apiObject[property] = this[property].reduce(
+                        function(result, item) {
+
+                            if (item instanceof R3.Runtime) {
+                                throw new Error('Please don\'t store Runtime Objects in Arrays');
+                            }
+
+                            result.push(this.getPropertyValue(item));
+
+                            return result;
+
+                        }.bind(this),
+                        []
+                    );
+
+                } else {
+
+                    /**
+                     * This is not an array, so get the proper value directly from the property
+                     */
+                    apiObject[property] = this.getPropertyValue(this[property]);
+                }
+            }
+        }
+    }
 };
 
 /**
@@ -2436,7 +2595,7 @@ R3.Component.GetRuntimeObject = function(info) {
         }
     );
 
-    if (info.runtime === R3.Component.GRAPHICS_RUNTIME) {
+    if (info.runtime instanceof R3.Runtime.Graphics) {
 
         if (R3.Utils.UndefinedOrNull(runtime.graphics)) {
             console.warn('no runtime graphics: ', info);
@@ -2523,4 +2682,4 @@ R3.Component.ConstructFromObject = function(rawComponentObject) {
     }
 
     return runtimeComponent;
-};
\ No newline at end of file
+};
diff --git a/src/r3-api-clock.js b/src/r3-api-clock.js
index 3639b8e..7e8a02b 100644
--- a/src/r3-api-clock.js
+++ b/src/r3-api-clock.js
@@ -7,7 +7,7 @@ R3.API.Clock = function(
     apiComponent
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 };
 
diff --git a/src/r3-api-controls-0.js b/src/r3-api-controls-0.js
index b3761b5..063a1b5 100644
--- a/src/r3-api-controls-0.js
+++ b/src/r3-api-controls-0.js
@@ -9,7 +9,7 @@ R3.API.Controls = function(
     canvas
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(canvas)) {
         /**
diff --git a/src/r3-api-curve-a.js b/src/r3-api-curve-0.js
similarity index 93%
rename from src/r3-api-curve-a.js
rename to src/r3-api-curve-0.js
index 4179d46..ab24bee 100644
--- a/src/r3-api-curve-a.js
+++ b/src/r3-api-curve-0.js
@@ -9,7 +9,7 @@ R3.API.Curve = function(
     arcLenghDivisions
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(arcLenghDivisions)) {
         arcLenghDivisions = 200;
diff --git a/src/r3-api-custom-code.js b/src/r3-api-custom-code.js
index 045f894..622b3de 100644
--- a/src/r3-api-custom-code.js
+++ b/src/r3-api-custom-code.js
@@ -11,7 +11,7 @@ R3.API.CustomCode = function(
 	code
 ) {
 
-	__API_COMPONENT_MACRO__
+	__API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(eventId)) {
 		eventId = R3.Event.KEY_UP;
diff --git a/src/r3-api-dom-element.js b/src/r3-api-dom-element.js
index 05ff5bc..7d36479 100644
--- a/src/r3-api-dom-element.js
+++ b/src/r3-api-dom-element.js
@@ -9,7 +9,7 @@ R3.API.DomElement = function(
     domElementId
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(domElementId)) {
         domElementId = '';
diff --git a/src/r3-api-draw-range.js b/src/r3-api-draw-range.js
index a11fdcf..117d324 100644
--- a/src/r3-api-draw-range.js
+++ b/src/r3-api-draw-range.js
@@ -11,7 +11,7 @@ R3.API.DrawRange = function(
     count
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(start)) {
         start = 0;
diff --git a/src/r3-api-entity-manager.js b/src/r3-api-entity-manager.js
index cc7a44c..389131c 100644
--- a/src/r3-api-entity-manager.js
+++ b/src/r3-api-entity-manager.js
@@ -9,7 +9,7 @@ R3.API.EntityManager = function(
     entities
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(entities)) {
 		entities = [];
diff --git a/src/r3-api-entity.js b/src/r3-api-entity.js
index 42ff8b1..49e5e55 100644
--- a/src/r3-api-entity.js
+++ b/src/r3-api-entity.js
@@ -9,7 +9,7 @@ R3.API.Entity = function(
     components
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(components)) {
         components = [];
diff --git a/src/r3-api-group.js b/src/r3-api-group.js
index 924e8a1..434385c 100644
--- a/src/r3-api-group.js
+++ b/src/r3-api-group.js
@@ -13,7 +13,7 @@ R3.API.Group = function(
     materialIndex
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(start)) {
         start = 0;
diff --git a/src/r3-api-gui.js b/src/r3-api-gui.js
index 0923812..7e42b17 100644
--- a/src/r3-api-gui.js
+++ b/src/r3-api-gui.js
@@ -9,7 +9,7 @@ R3.API.GUI = function(
     domElement
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(domElement)) {
         domElement = null;
diff --git a/src/r3-api-image.js b/src/r3-api-image.js
index a5ef388..fda5580 100644
--- a/src/r3-api-image.js
+++ b/src/r3-api-image.js
@@ -21,7 +21,7 @@ R3.API.Image = function(
     height
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(fileName)) {
 		fileName = R3.Utils.LowerUnderscore(name);
diff --git a/src/r3-api-mouse.js b/src/r3-api-mouse.js
index fb17551..117141d 100644
--- a/src/r3-api-mouse.js
+++ b/src/r3-api-mouse.js
@@ -11,7 +11,7 @@ R3.API.Mouse = function(
     y
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(x)) {
         x = 0;
diff --git a/src/r3-api-plane.js b/src/r3-api-plane.js
index c2bd19b..f5aca4a 100644
--- a/src/r3-api-plane.js
+++ b/src/r3-api-plane.js
@@ -11,7 +11,7 @@ R3.API.Plane = function(
     constant
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(normal)) {
         normal = new R3.API.Vector3(1,0,0);
diff --git a/src/r3-api-project.js b/src/r3-api-project.js
index 0720555..0f52924 100644
--- a/src/r3-api-project.js
+++ b/src/r3-api-project.js
@@ -6,6 +6,7 @@
  * @param entities
  * @param renderers
  * @param cameras
+ * @param audios
  * @param mode
  * @constructor
  */
@@ -16,10 +17,11 @@ R3.API.Project = function(
     entities,
     renderers,
     cameras,
+    audios,
     mode
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(users)) {
         throw new Error('Only registered users can create projects');
@@ -56,6 +58,11 @@ R3.API.Project = function(
     }
     this.cameras = cameras;
 
+    if (R3.Utils.UndefinedOrNull(audios)) {
+        audios = [];
+    }
+    this.audios = audios;
+
     if (R3.Utils.UndefinedOrNull(mode)) {
         mode = R3.API.Project.APPLICATION_MODE_EDIT;
     }
diff --git a/src/r3-api-renderer-a.js b/src/r3-api-renderer-a.js
index ad56170..0d03a3a 100644
--- a/src/r3-api-renderer-a.js
+++ b/src/r3-api-renderer-a.js
@@ -7,7 +7,7 @@ R3.API.Renderer = function(
     apiComponent
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 };
 
diff --git a/src/r3-api-server.js b/src/r3-api-server.js
index ccbe53f..caa7ac7 100644
--- a/src/r3-api-server.js
+++ b/src/r3-api-server.js
@@ -23,7 +23,7 @@ R3.API.Server = function(
     protocols
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(protocol)) {
         protocol = R3.API.Server.PROTOCOL_HTTP_SSL;
diff --git a/src/r3-api-socket-0.js b/src/r3-api-socket-0.js
index 6689877..7039bd9 100644
--- a/src/r3-api-socket-0.js
+++ b/src/r3-api-socket-0.js
@@ -13,7 +13,7 @@ R3.API.Socket = function(
     server
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(roomId)) {
         roomId = 'room_' + R3.Utils.RandomId();
diff --git a/src/r3-api-sphere.js b/src/r3-api-sphere.js
index 8aece3f..53be1e5 100644
--- a/src/r3-api-sphere.js
+++ b/src/r3-api-sphere.js
@@ -11,7 +11,7 @@ R3.API.Sphere = function(
     radius
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(center)) {
         center = new R3.API.Vector3(0,0,0);
diff --git a/src/r3-api-stats.js b/src/r3-api-stats.js
index 7841d4d..762b4c0 100644
--- a/src/r3-api-stats.js
+++ b/src/r3-api-stats.js
@@ -9,7 +9,7 @@ R3.API.Stats = function(
     domElement
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(domElement)) {
         domElement = null;
diff --git a/src/r3-api-user.js b/src/r3-api-user.js
index bcb0e6d..ce78fa6 100644
--- a/src/r3-api-user.js
+++ b/src/r3-api-user.js
@@ -23,7 +23,7 @@ R3.API.User = function(
     idToken
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(googleId)) {
         throw new Error('invalid user - no google ID');
diff --git a/src/r3-api-video.js b/src/r3-api-video.js
index dba474b..900e483 100644
--- a/src/r3-api-video.js
+++ b/src/r3-api-video.js
@@ -17,7 +17,7 @@ R3.API.Video = function(
     source
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(autoUpdateSize)) {
         autoUpdateSize = true;
diff --git a/src/r3-box3.js b/src/r3-box3.js
index 6220315..5651f1f 100644
--- a/src/r3-box3.js
+++ b/src/r3-box3.js
@@ -1,29 +1,21 @@
 /**
  * R3.Box3
  * @param parent
- * @param apiBox3
+ * @param apiComponent
  * @constructor
  */
 R3.Box3 = function(
     parent,
-    apiBox3
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(parent)) {
-        parent = null;
-    }
-    this.parent = parent;
-
-    if (R3.Utils.UndefinedOrNull(apiBox3)) {
-        apiBox3 = {};
-    }
-    this.apiBox3 = apiBox3;
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Box3.call(
         this,
-        this.apiBox3,
-        this.apiBox3.min,
-        this.apiBox3.max
+        apiComponent,
+        apiComponent.min,
+        apiComponent.max
     );
 
     this.min = new R3.Vector3(
@@ -36,20 +28,12 @@ R3.Box3 = function(
         this.max
     );
 
-    this.graphics    = null;
-    this.physics     = null;
-
-    R3.Event.Emit(
-        R3.Event.GET_RUNTIME,
-        function(runtime) {
-            this.graphics    = runtime.graphics;
-            this.physics     = runtime.physics;
-        }.bind(this)
-    );
-
     this.componentRuntime = R3.Component.GetComponentRuntime(this.parent);
 
-    this.createInstance();
+    R3.Component.call(
+        this,
+        parent
+    );
 };
 
 R3.Box3.prototype = Object.create(R3.Component.prototype);
@@ -90,27 +74,16 @@ R3.Box3.prototype.updateInstance = function(property) {
         this.instance.min.x = this.min.x;
         this.instance.min.y = this.min.y;
         this.instance.min.z = this.min.z;
+        return;
     }
 
     if (property === 'max') {
         this.instance.max.x = this.max.x;
         this.instance.max.y = this.max.y;
         this.instance.max.z = this.max.z;
+        return;
     }
-};
 
-/**
- * R3.Box3 to R3.API.Box3
- * @returns {R3.API.Box3}
- */
-R3.Box3.prototype.toApiObject = function() {
-    return new R3.API.Box3(
-        new R3.API.Component(
-            this.parent,
-            this.id,
-            this.name
-        ),
-        this.min.toApiObject(),
-        this.max.toApiObject()
-    );
+    R3.Component.prototype.updateInstance.call(this, property);
+
 };
diff --git a/src/r3-canvas.js b/src/r3-canvas.js
index beb76b9..692492f 100644
--- a/src/r3-canvas.js
+++ b/src/r3-canvas.js
@@ -1,50 +1,42 @@
 /**
- * Canvas object
- * @param graphics
- * @param apiCanvas
- * @returns {R3.Canvas}
+ * R3.Canvas
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Canvas = function(
-    graphics,
-	apiCanvas
+    parent,
+    apiComponent
 ) {
-    this.graphics = graphics;
 
-    if (R3.Utils.UndefinedOrNull(apiCanvas)) {
-		apiCanvas = {};
-	}
+    __RUNTIME_COMPONENT_MACRO__;
 
 	R3.API.Canvas.call(
 		this,
-		apiCanvas.id,
-		apiCanvas.name,
-		apiCanvas.parent,
-		apiCanvas.parentTexture,
-		apiCanvas.autoUpdateSize,
-		apiCanvas.width,
-		apiCanvas.height,
-		apiCanvas.offset,
-		apiCanvas.tabIndex,
-		apiCanvas.texts,
-        apiCanvas.textBaseline
+        apiComponent,
+        apiComponent.autoUpdateSize,
+        apiComponent.width,
+        apiComponent.height,
+        apiComponent.offset,
+        apiComponent.tabIndex,
+        apiComponent.texts,
+        apiComponent.textBaseline
 	);
 
     this.offset = new R3.Vector2(
-        this.graphics,
-        this.offset,
-        this
-    );
-
-    R3.Component.call(
         this,
-        {
-            'parentTexture' : R3.D3.Texture,
-            'texts' : [R3.D3.Text]
-        }
+        this.offset
     );
 
     this.context = null;
+
+    R3.Component.call(
+        this,
+        parent,
+        {
+            'texts' : [R3.D3.Text]
+        }
+    );
 };
 
 R3.Canvas.prototype = Object.create(R3.Component.prototype);
@@ -154,31 +146,10 @@ R3.Canvas.prototype.updateInstance = function(property) {
     R3.Component.prototype.updateInstance.call(this, property);
 };
 
-/**
- * Converts a R3.Canvas to a R3.API.Canvas
- * @returns {R3.API.Canvas}
- */
-R3.Canvas.prototype.toApiObject = function() {
-
-	return new R3.API.Canvas(
-        this.id,
-        this.name,
-        R3.Utils.IdOrNull(this.parent),
-        R3.Utils.IdOrNull(this.parentTexture),
-        this.autoUpdateSize,
-        this.width,
-        this.height,
-        this.offset.toApiObject(),
-        this.tabIndex,
-		this.texts.map(function(text){
-		    return R3.Utils.IdOrNull(text)
-        }),
-        this.textBaseline
-	);
-};
-
 R3.Canvas.prototype.writeText = function() {
 
+    var parentTexture = this.getFirstParent(R3.D3.Texture);
+
     this.clear();
 
     this.texts.map(
@@ -189,14 +160,12 @@ R3.Canvas.prototype.writeText = function() {
                 this.context = this.instance.getContext('2d');
             }
 
-            text.parentCanvas = this;
-
             this.context.fillStyle = text.fillStyle;
             this.context.font = text.font;
             this.context.fillText(text.value, text.offset.x, text.offset.y);
 
-            if (this.parentTexture && this.parentTexture.instance) {
-                this.parentTexture.instance.needsUpdate = true;
+            if (parentTexture && parentTexture.instance) {
+                parentTexture.instance.needsUpdate = true;
             }
 
         }.bind(this)
diff --git a/src/r3-clock.js b/src/r3-clock.js
index fe3a9a0..df3939d 100644
--- a/src/r3-clock.js
+++ b/src/r3-clock.js
@@ -1,49 +1,47 @@
 /**
- * Creates a Clock object
- * @param graphics
- * @param apiClock R3.API.Clock
+ * R3.Clock
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Clock = function(
-    graphics,
-    apiClock
+    parent,
+    apiComponent
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiClock)) {
-        apiClock = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Clock.call(
         this,
-        apiClock.id,
-        apiClock.name,
-        apiClock.parent
+        apiComponent
     );
 
-    R3.Component.call(this);
+    R3.Component.call(
+        this,
+        parent
+    );
 } ;
 
 R3.Clock.prototype = Object.create(R3.Component.prototype);
 R3.Clock.prototype.constructor = R3.Clock;
 
 /**
- * Creates a camera instance of 'graphics' type (only THREE for now)
- * @returns {THREE.Clock}
+ * R3.Clock.prototype.createInstance
  */
 R3.Clock.prototype.createInstance = function() {
 
-    this.instance = new THREE.Clock();
+    this.instance = this.graphics.Clock();
 
     R3.Component.prototype.createInstance.call(this);
 };
 
 /**
- * Updates the instance with the current state
+ * R3.Clock.prototype.updateInstance
+ * @param property
  */
-R3.Clock.prototype.updateInstance = function() {
+R3.Clock.prototype.updateInstance = function(property) {
+
+    R3.Component.prototype.updateInstance.call(this, property);
 
 };
 
@@ -54,7 +52,6 @@ R3.Clock.prototype.getDelta = function() {
     /**
      * clamp the delta to 1/60
      */
-
     if (delta > (1 / 30.0)) {
         // console.log('clipped ' + (delta - (1/30.0)) + ' seconds - essentially lost time');
         delta = (1 / 30.0);
@@ -62,35 +59,3 @@ R3.Clock.prototype.getDelta = function() {
 
     return delta;
 };
-
-/**
- * Converts a R3.Clock to a new R3.API.Clock
- * @returns {R3.API.Clock}
- */
-R3.Clock.prototype.toApiObject = function() {
-
-    return new R3.API.Clock(
-        this.id,
-        this.name,
-        R3.Utils.IdOrNull(this.parent)
-    );
-
-};
-
-/**
- * Converts from an Object camera to a R3.Clock
- * @param graphics R3.Graphics
- * @param objectClock Object
- * @returns {R3.Clock}
- * @constructor
- */
-R3.Clock.FromObject = function(graphics, objectClock) {
-
-    var apiClock = R3.API.Clock.FromObject(objectClock);
-
-    return new R3.Clock(
-        graphics,
-        apiClock
-    );
-
-};
diff --git a/src/r3-coder-runtime.js b/src/r3-coder-runtime.js
deleted file mode 100644
index ae1ef1b..0000000
--- a/src/r3-coder-runtime.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Coder
- * @param id
- * @param name
- * @param coderType
- * @constructor
- */
-R3.CoderRuntime = function(
-    id,
-    name,
-    coderType
-) {
-    if (R3.Utils.UndefinedOrNull(id)) {
-        id = R3.Utils.RandomId();
-    }
-    this.id = id;
-
-    if (R3.Utils.UndefinedOrNull(name)) {
-        name = 'Coder (' + id + ')';
-    }
-    this.name = name;
-
-    if (R3.Utils.UndefinedOrNull(coderType)) {
-        coderType = R3.CoderRuntime.TYPE_CODE_MIRROR;
-    }
-    this.coderType = coderType;
-
-    this.createInstance();
-};
-
-/**
- * R3.CoderRuntime Types
- * @type {number}
- */
-R3.CoderRuntime.TYPE_CODE_MIRROR = 0x1;
-
-R3.CoderRuntime.prototype.createInstance = function() {
-    if (this.coderType === R3.CoderRuntime.TYPE_CODE_MIRROR) {
-        this.instance = CodeMirror;
-    } else {
-        this.instance = null;
-    }
-};
-
-R3.CoderRuntime.prototype.updateInstance = function(property) {
-    if (property === 'coderType') {
-        this.createInstance();
-    }
-};
-
-/**
- * Logs a warning and throws an error if not cannon
- */
-R3.CoderRuntime.prototype.isNotCodeMirrorThrow = function() {
-    if (this.instance !== CodeMirror) {
-        console.error('Only CodeMirror supported');
-        throw new Error('Only CodeMirror supported');
-    }
-};
-    
\ No newline at end of file
diff --git a/src/r3-color.js b/src/r3-color.js
index fdf5680..72bf557 100644
--- a/src/r3-color.js
+++ b/src/r3-color.js
@@ -1,12 +1,12 @@
 /**
- * Runtime color for updating instance objects
+ * R3.Color
  * @param parent
- * @param apiColor R3.API.Color
+ * @param apiComponent
  * @constructor
  */
 R3.Color = function(
     parent,
-    apiColor
+    apiComponent
 ) {
 
     if (R3.Utils.UndefinedOrNull(parent)) {
@@ -14,32 +14,16 @@ R3.Color = function(
     }
     this.parent = parent;
 
-    if (R3.Utils.UndefinedOrNull(apiColor)) {
-        apiColor = {};
-    }
-    this.apiColor = apiColor;
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Color.call(
         this,
-        this.apiColor.r,
-        this.apiColor.g,
-        this.apiColor.b,
-        this.apiColor.a
+        apiComponent.r,
+        apiComponent.g,
+        apiComponent.b,
+        apiComponent.a
     );
 
-    this.graphics    = null;
-    this.physics     = null;
-
-    R3.Event.Emit(
-        R3.Event.GET_RUNTIME,
-        function(runtime) {
-            this.graphics    = runtime.graphics;
-            this.physics     = runtime.physics;
-        }.bind(this)
-    );
-
-    this.componentRuntime = R3.Component.GetComponentRuntime(parent);
-
     this.createInstance();
 };
 
@@ -52,16 +36,13 @@ R3.Color.prototype.constructor = R3.Color;
  */
 R3.Color.prototype.createInstance = function() {
 
-    switch (this.componentRuntime) {
-        case R3.Component.GRAPHICS_RUNTIME :
-            this.instance = this.graphics.Color(
-                this.r,
-                this.g,
-                this.b,
-                this.a
-            );
-            break;
-    }
+    this.instance = this.graphics.Color(
+        this.r,
+        this.g,
+        this.b,
+        this.a
+    );
+
 };
 
 /**
@@ -69,13 +50,24 @@ R3.Color.prototype.createInstance = function() {
  */
 R3.Color.prototype.updateInstance = function(property) {
 
-    this.instance.r = this.r;
-    this.instance.g = this.g;
-    this.instance.b = this.b;
+    if (property === 'r') {
+        this.instance.r = this.r;
+        return;
+    }
 
-    if (this.parentObject &&
-        this.parentObject.updateInstance) {
-        this.parentObject.updateInstance(property);
+    if (property === 'g') {
+        this.instance.g = this.g;
+        return;
+    }
+
+    if (property === 'b') {
+        this.instance.b = this.b;
+        return;
+    }
+
+    if (property === 'a') {
+        this.instance.a = this.a;
+        return;
     }
 };
 
diff --git a/src/r3-controls-0.js b/src/r3-controls-0.js
index 3c2e715..243fbc8 100644
--- a/src/r3-controls-0.js
+++ b/src/r3-controls-0.js
@@ -1,71 +1,37 @@
 /**
- * R3.Controls
- * @param apiControls
- * @property controlsType
+ * R3.Controls is an R3.Component
+ * @param parent
+ * @param linkedObjects
  * @constructor
  */
 R3.Controls = function(
-    apiControls
+    parent,
+    linkedObjects
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiControls)) {
-        apiControls = {};
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+        linkedObjects = {};
     }
 
-	R3.API.Controls.call(
-        this,
-        apiControls.id,
-        apiControls.name,
-        apiControls.canvas,
-        apiControls.parent
-    );
-
-    var linkedObjects = {
-        canvas : R3.Canvas
-    };
-
-    var delayed = false;
-
-    switch (this.controlsType) {
-        case (R3.API.Controls.CONTROLS_TYPE_EDITOR) :
-            linkedObjects.raycaster     = R3.D3.Raycaster;
-            linkedObjects.camera        = R3.D3.Camera;
-            delayed = true;
-            break;
-        case (R3.API.Controls.CONTROLS_TYPE_FIRST_PERSON) :
-            linkedObjects.camera        = R3.D3.Camera;
-            delayed = true;
-            break;
-        case (R3.API.Controls.CONTROLS_TYPE_ORBIT) :
-            linkedObjects.camera        = R3.D3.Camera;
-            linkedObjects.target        = R3.Component;
-            delayed = true;
-            break;
+    if (this.canvas instanceof R3.API.Component) {
+        this.canvas = R3.Component.ConstructFromObject(this.canvas);
     }
 
+    linkedObjects.canvas = R3.Canvas;
+
 	R3.Component.call(
         this,
-		linkedObjects,
-        delayed
+		parent,
+        linkedObjects
     );
 };
 
 R3.Controls.prototype = Object.create(R3.Component.prototype);
 R3.Controls.prototype.constructor = R3.Controls;
 
-R3.Controls.D3 = function() {};
-R3.Controls.D3.prototype = Object.create(R3.Controls.prototype);
-R3.Controls.D3.prototype.constructor = R3.Controls.D3;
-
 /**
- * Creates a mesh instance or updates it
- */
-R3.Controls.prototype.createInstance = function() {
-    R3.Component.prototype.createInstance.call(this);
-};
-
-/**
- * Updates the mesh instance
+ * R3.Controls.prototype.updateInstance
+ * @param property
  */
 R3.Controls.prototype.updateInstance = function(property) {
 
@@ -76,24 +42,8 @@ R3.Controls.prototype.updateInstance = function(property) {
                 component: this
             }
         );
+        return;
     }
 
     R3.Component.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Controls to a R3.API.Controls
- * @returns {R3.API.Controls}
- */
-R3.Controls.prototype.toApiObject = function() {
-
-    var apiControls = new R3.API.Controls(
-        this.id,
-        this.name,
-        this.controlsType,
-        R3.Utils.IdOrNull(this.canvas),
-		R3.Utils.IdOrNull(this.parent)
-    );
-
-    return apiControls;
-};
diff --git a/src/r3-controls-d3-editor.js b/src/r3-controls-d3-editor.js
index 5854336..b17c45e 100644
--- a/src/r3-controls-d3-editor.js
+++ b/src/r3-controls-d3-editor.js
@@ -1,46 +1,35 @@
 /**
- * Controls Superset - The apiControls properties get moved into the Controls object itself, and then the instance is created
- * @param graphics R3.GraphicsRuntime
- * @param apiEditorControls
+ * R3.Controls.D3.Editor is an R3.Controls.D3
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Controls.D3.Editor = function(
-    graphics,
-    apiEditorControls
+    parent,
+    apiComponent
 ) {
 
-	this.graphics = graphics;
-	this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiEditorControls)) {
-        apiEditorControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_EDITOR
-        };
-    }
-
-    if (R3.Utils.UndefinedOrNull()) {
-        apiEditorControls.controlsType = R3.API.Controls.CONTROLS_TYPE_EDITOR;
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.D3.Editor.call(
         this,
-        apiEditorControls,
-        apiEditorControls.raycaster,
-        apiEditorControls.camera
+        apiComponent,
+        apiComponent.raycaster
     );
 
-    if (this.raycaster instanceof R3.D3.API.Raycaster) {
-        this.raycaster = new R3.D3.Raycaster(
-            this.graphics,
-            this.raycaster
-        );
+    if (this.raycaster instanceof R3.API.Component) {
+        this.raycaster = R3.Component.ConstructFromObject(this.raycaster);
     }
 
-    R3.Controls.call(
-        this,
-        apiEditorControls
-    );
+    var linkedObjects = {
+        raycaster : R3.D3.Raycaster
+    };
 
+    R3.Controls.D3.call(
+        this,
+        parent,
+        linkedObjects
+    )
 };
 
 /**
@@ -55,28 +44,9 @@ R3.Controls.D3.Editor.prototype.constructor = R3.Controls.D3.Editor;
  */
 R3.Controls.D3.Editor.prototype.createInstance = function() {
 
-    if (
-        R3.Utils.UndefinedOrNull(this.camera) ||
-        R3.Utils.UndefinedOrNull(this.camera.instance)
-    ) {
-        console.warn('no camera at time of editor-controls create instance');
-        return;
-    }
+    this.instance = this.graphics.EditorControls(this.canvas, this.camera);
 
-    if (
-        R3.Utils.UndefinedOrNull(this.canvas) ||
-        R3.Utils.UndefinedOrNull(this.canvas.instance)
-    ) {
-        console.warn('no canvas at time of editor-controls create instance');
-        return;
-    }
-
-    this.instance = new THREE.EditorControls(
-        this.camera.instance,
-        this.canvas.instance
-    );
-
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -85,32 +55,10 @@ R3.Controls.D3.Editor.prototype.createInstance = function() {
 R3.Controls.D3.Editor.prototype.updateInstance = function(property) {
 
     if (
-        property === 'canvas' ||
-        property === 'camera'
+        property === 'raycaster'
     ) {
-        if (R3.Utils.UndefinedOrNull(this.instance)) {
-            this.createInstance();
-        } else {
-            this.instance.dispose();
-            this.createInstance();
-        }
+       console.warn('todo : update raycaster');
     }
 
-    console.warn('an update instance was called on editor controls - which, if not called from within a running system at the right time will affect the order of input event handling and cause system instability');
-
-	R3.Controls.prototype.updateInstance.call(this, property);
-};
-
-/**
- * Converts a R3.Controls.D3.Editor to a R3.D3.API.Mesh
- * @returns {R3.API.Controls}
- */
-R3.Controls.D3.Editor.prototype.toApiObject = function() {
-
-	var apiControls = R3.Controls.prototype.toApiObject.call(this);
-
-	apiControls.raycaster   = R3.Utils.IdOrNull(this.raycaster);
-	apiControls.camera      = R3.Utils.IdOrNull(this.camera);
-
-	return apiControls;
+    R3.Controls.D3.prototype.updateInstance.call(this, property);
 };
diff --git a/src/r3-controls-d3-first-person.js b/src/r3-controls-d3-first-person.js
index 0d8d581..5b66518 100644
--- a/src/r3-controls-d3-first-person.js
+++ b/src/r3-controls-d3-first-person.js
@@ -1,51 +1,39 @@
 /**
- * Controls Superset - The apiControls properties get moved into the Controls object itself, and then the instance is created
- * @param graphics R3.GraphicsRuntime
- * @param apiFirstPersonControls
+ * R3.Controls.D3.FirstPerson is an R3.Controls.D3
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Controls.D3.FirstPerson = function(
-    graphics,
-    apiFirstPersonControls
+    parent,
+    apiComponent
 ) {
 
-	this.graphics = graphics;
-	this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiFirstPersonControls)) {
-        apiFirstPersonControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_FIRST_PERSON
-        };
-    }
-
-    if (R3.Utils.UndefinedOrNull()) {
-        apiFirstPersonControls.controlsType = R3.API.Controls.CONTROLS_TYPE_FIRST_PERSON;
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.D3.FirstPerson.call(
         this,
-        apiFirstPersonControls,
-        apiFirstPersonControls.camera,
-        apiFirstPersonControls.enabled,
-        apiFirstPersonControls.movementSpeed,
-        apiFirstPersonControls.lookSpeed,
-        apiFirstPersonControls.lookVertical,
-        apiFirstPersonControls.autoForward,
-        apiFirstPersonControls.activeLook,
-        apiFirstPersonControls.heightSpeed,
-        apiFirstPersonControls.heightCoef,
-        apiFirstPersonControls.heightMin,
-        apiFirstPersonControls.heightMax,
-        apiFirstPersonControls.constrainVertical,
-        apiFirstPersonControls.verticalMin,
-        apiFirstPersonControls.verticalMax,
-        apiFirstPersonControls.autoSpeedFactor
+        apiComponent,
+        apiComponent.enabled,
+        apiComponent.movementSpeed,
+        apiComponent.lookSpeed,
+        apiComponent.lookVertical,
+        apiComponent.autoForward,
+        apiComponent.activeLook,
+        apiComponent.heightSpeed,
+        apiComponent.heightCoef,
+        apiComponent.heightMin,
+        apiComponent.heightMax,
+        apiComponent.constrainVertical,
+        apiComponent.verticalMin,
+        apiComponent.verticalMax,
+        apiComponent.autoSpeedFactor
     );
-
-    R3.Controls.call(
+    
+    R3.Controls.D3.call(
         this,
-        apiFirstPersonControls
-    );
+        parent
+    )
 
 };
 
@@ -61,43 +49,26 @@ R3.Controls.D3.FirstPerson.prototype.constructor = R3.Controls.D3.FirstPerson;
  */
 R3.Controls.D3.FirstPerson.prototype.createInstance = function() {
 
-    if (
-        R3.Utils.UndefinedOrNull(this.camera) ||
-        R3.Utils.UndefinedOrNull(this.camera.instance)
-    ) {
-        console.warn('no camera at time of editor-controls create instance');
-        return;
-    }
-
-    if (
-        R3.Utils.UndefinedOrNull(this.canvas) ||
-        R3.Utils.UndefinedOrNull(this.canvas.instance)
-    ) {
-        console.warn('no canvas at time of editor-controls create instance');
-        return;
-    }
-
-    this.instance = new THREE.FirstPersonControls(
-        this.camera.instance,
-        this.canvas.instance
+    this.instance = this.graphics.FirstPersonControls(
+        this.canvas,
+        this.camera,
+        this.enabled,
+        this.movementSpeed,
+        this.lookSpeed,
+        this.lookVertical,
+        this.autoForward,
+        this.activeLook,
+        this.heightSpeed,
+        this.heightCoef,
+        this.heightMin,
+        this.heightMax,
+        this.constrainVertical,
+        this.verticalMin,
+        this.verticalMax,
+        this.autoSpeedFactor
     );
-
-    this.instance.enabled           = this.enabled;
-    this.instance.movementSpeed     = this.movementSpeed;
-    this.instance.lookSpeed         = this.lookSpeed;
-    this.instance.lookVertical      = this.lookVertical;
-    this.instance.autoForward       = this.autoForward;
-    this.instance.activeLook        = this.activeLook;
-    this.instance.heightSpeed       = this.heightSpeed;
-    this.instance.heightCoef        = this.heightCoef;
-    this.instance.heightMin         = this.heightMin;
-    this.instance.heightMax         = this.heightMax;
-    this.instance.constrainVertical = this.constrainVertical;
-    this.instance.verticalMin       = this.verticalMin;
-    this.instance.verticalMax       = this.verticalMax;
-    this.instance.autoSpeedFactor   = this.autoSpeedFactor;
     
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -105,18 +76,6 @@ R3.Controls.D3.FirstPerson.prototype.createInstance = function() {
  */
 R3.Controls.D3.FirstPerson.prototype.updateInstance = function(property) {
 
-    if (
-        property === 'canvas' ||
-        property === 'camera'
-    ) {
-        if (R3.Utils.UndefinedOrNull(this.instance)) {
-            this.createInstance();
-        } else {
-            this.instance.dispose();
-            this.createInstance();
-        }
-    }
-    
     if (property === 'enabled') {
         this.instance.enabled = this.enabled;
         return;
@@ -186,35 +145,6 @@ R3.Controls.D3.FirstPerson.prototype.updateInstance = function(property) {
         this.instance.autoSpeedFactor = this.autoSpeedFactor;
         return;
     }
-   
   
-	R3.Controls.prototype.updateInstance.call(this, property);
-};
-
-/**
- * Converts a R3.Controls.D3.FirstPerson to a R3.D3.API.Mesh
- * @returns {R3.API.Controls}
- */
-R3.Controls.D3.FirstPerson.prototype.toApiObject = function() {
-
-	var apiControls = R3.Controls.prototype.toApiObject.call(this);
-
-	return new R3.API.Controls.D3.FirstPerson(
-	    apiControls,
-        R3.Utils.IdOrNull(this.camera),
-        this.enabled,
-        this.movementSpeed,
-		this.lookSpeed,
-		this.lookVertical,
-		this.autoForward,
-		this.activeLook,
-		this.heightSpeed,
-		this.heightCoef,
-		this.heightMin,
-		this.heightMax,
-		this.constrainVertical,
-		this.verticalMin,
-		this.verticalMax,
-		this.autoSpeedFactor  
-    );
+	R3.Controls.D3.prototype.updateInstance.call(this, property);
 };
diff --git a/src/r3-controls-d3-orbit.js b/src/r3-controls-d3-orbit.js
index cfdbaed..ff05f7b 100644
--- a/src/r3-controls-d3-orbit.js
+++ b/src/r3-controls-d3-orbit.js
@@ -1,59 +1,52 @@
 /**
- * Controls Superset - The apiControls properties get moved into the Controls object itself, and then the instance is created
- * @param graphics R3.GraphicsRuntime
- * @param apiOrbitControls
+ * R3.Controls.D3.Orbit is an R3.Controls.D3
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Controls.D3.Orbit = function(
-    graphics,
-    apiOrbitControls
+    parent,
+    apiComponent
 ) {
 
-	this.graphics = graphics;
-	this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiOrbitControls)) {
-        apiOrbitControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_ORBIT
-        };
-    }
-
-    if (R3.Utils.UndefinedOrNull()) {
-        apiOrbitControls.controlsType = R3.API.Controls.CONTROLS_TYPE_ORBIT;
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.D3.Orbit.call(
         this,
-        apiOrbitControls,
-        apiOrbitControls.camera,
-        apiOrbitControls.target,
-        apiOrbitControls.enabled,
-        apiOrbitControls.minPolarAngle,
-        apiOrbitControls.maxPolarAngle,
-        apiOrbitControls.enableDamping,
-        apiOrbitControls.dampingFactor,
-        apiOrbitControls.enableZoom,
-        apiOrbitControls.zoomSpeed,
-        apiOrbitControls.enableRotate,
-        apiOrbitControls.rotateSpeed,
-        apiOrbitControls.enablePan,
-        apiOrbitControls.keyPanSpeed,
-        apiOrbitControls.autoRotate,
-        apiOrbitControls.autoRotateSpeed,
-        apiOrbitControls.enableKeys
+        apiComponent,
+        apiComponent.target,
+        apiComponent.enabled,
+        apiComponent.minPolarAngle,
+        apiComponent.maxPolarAngle,
+        apiComponent.enableDamping,
+        apiComponent.dampingFactor,
+        apiComponent.enableZoom,
+        apiComponent.zoomSpeed,
+        apiComponent.enableRotate,
+        apiComponent.rotateSpeed,
+        apiComponent.enablePan,
+        apiComponent.keyPanSpeed,
+        apiComponent.autoRotate,
+        apiComponent.autoRotateSpeed,
+        apiComponent.enableKeys
     );
 
-    R3.Controls.call(
+    if (this.target instanceof R3.API.Component) {
+        this.target = R3.Component.ConstructFromObject(this.target);
+    }
+   
+    var linkedObjects = {
+        target : R3.D3.Object
+    };
+
+    R3.Controls.D3.call(
         this,
-        apiOrbitControls
-    );
+        parent,
+        linkedObjects
+    )
 
 };
 
-/**
- * Inheritance
- * @type {R3.Controls}
- */
 R3.Controls.D3.Orbit.prototype = Object.create(R3.Controls.D3.prototype);
 R3.Controls.D3.Orbit.prototype.constructor = R3.Controls.D3.Orbit;
 
@@ -62,47 +55,27 @@ R3.Controls.D3.Orbit.prototype.constructor = R3.Controls.D3.Orbit;
  */
 R3.Controls.D3.Orbit.prototype.createInstance = function() {
 
-    if (
-        R3.Utils.UndefinedOrNull(this.camera) ||
-        R3.Utils.UndefinedOrNull(this.camera.instance)
-    ) {
-        console.warn('no camera at time of editor-controls create instance');
-        return;
-    }
-
-    if (
-        R3.Utils.UndefinedOrNull(this.canvas) ||
-        R3.Utils.UndefinedOrNull(this.canvas.instance)
-    ) {
-        console.warn('no canvas at time of editor-controls create instance');
-        return;
-    }
-
-    this.instance = new THREE.OrbitControls(
-        this.camera.instance,
-        this.canvas.instance
+    this.instance = this.graphics.OrbitControls(
+        this.canvas,
+        this.camera,
+        this.target,
+        this.enabled,
+        this.minPolarAngle,
+        this.maxPolarAngle,
+        this.enableDamping,
+        this.dampingFactor,
+        this.enableZoom,
+        this.zoomSpeed,
+        this.enableRotate,
+        this.rotateSpeed,
+        this.enablePan,
+        this.keyPanSpeed,
+        this.autoRotate,
+        this.autoRotateSpeed,
+        this.enableKeys
     );
 
-    if (this.target && this.target.instance) {
-        this.instance.target = this.target.instance.position;
-    }
-
-	this.instance.enabled       = this.enabled;
-	this.instance.minPolarAngle = this.minPolarAngle;
-	this.instance.maxPolarAngle = this.maxPolarAngle;
-	this.instance.enableDamping = this.enableDamping;
-	this.instance.dampingFactor = this.dampingFactor;
-	this.instance.enableZoom    = this.enableZoom;
-	this.instance.zoomSpeed     = this.zoomSpeed;
-	this.instance.enableRotate  = this.enableRotate;
-	this.instance.rotateSpeed   = this.rotateSpeed;
-	this.instance.enablePan     = this.enablePan;
-	this.instance.keyPanSpeed   = this.keyPanSpeed;
-	this.instance.autoRotate    = this.autoRotate;
-	this.instance.autoRotateSpeed = this.autoRotateSpeed;
-	this.instance.enableKeys    = this.enableKeys;
-    
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -110,24 +83,12 @@ R3.Controls.D3.Orbit.prototype.createInstance = function() {
  */
 R3.Controls.D3.Orbit.prototype.updateInstance = function(property) {
 
-    if (
-        property === 'canvas' ||
-        property === 'camera'
-    ) {
-        if (R3.Utils.UndefinedOrNull(this.instance)) {
-            this.createInstance();
-        } else {
-            this.instance.dispose();
-            this.createInstance();
-        }
-    }
-
     if (property === 'target') {
 
         if (this.target && this.target.instance) {
             this.instance.target = this.target.instance.position;
         } else {
-            this.instance.target = new THREE.Vector3();
+            this.instance.target = new this.graphics.Vector3();
         }
         return;
     }
@@ -201,35 +162,6 @@ R3.Controls.D3.Orbit.prototype.updateInstance = function(property) {
         this.instance.enableKeys = this.enableKeys;
         return;
     }
-        
-	R3.Controls.prototype.updateInstance.call(this, property);
-};
-
-/**
- * Converts a R3.Controls.D3.Orbit to a R3.D3.API.Mesh
- * @returns {R3.API.Controls}
- */
-R3.Controls.D3.Orbit.prototype.toApiObject = function() {
-
-	var apiControls = R3.Controls.prototype.toApiObject.call(this);
-
-	return new R3.API.Controls.D3.Orbit(
-	    apiControls,
-        R3.Utils.IdOrNull(this.camera),
-        R3.Utils.IdOrNull(this.target),
-        this.enabled,
-		this.minPolarAngle,
-		this.maxPolarAngle,
-		this.enableDamping,
-		this.dampingFactor,
-		this.enableZoom,
-		this.zoomSpeed,
-		this.enableRotate,
-		this.rotateSpeed,
-		this.enablePan,
-		this.keyPanSpeed,
-		this.autoRotate,
-		this.autoRotateSpeed,
-		this.enableKeys 
-    );
+
+    R3.Controls.D3.prototype.updateInstance.call(this, property);
 };
diff --git a/src/r3-controls-d3.js b/src/r3-controls-d3.js
new file mode 100644
index 0000000..2aebaee
--- /dev/null
+++ b/src/r3-controls-d3.js
@@ -0,0 +1,37 @@
+/**
+ * R3.Controls.D3 is an R3.Controls
+ * @param parent
+ * @param linkedObjects
+ * @constructor
+ */
+R3.Controls.D3 = function(
+    parent,
+    linkedObjects
+) {
+
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+        linkedObjects = {};
+    }
+    linkedObjects.camera = R3.D3.Camera;
+
+    R3.Controls.call(
+        this,
+        parent,
+        linkedObjects
+    );
+
+};
+
+R3.Controls.D3.prototype = Object.create(R3.Controls.prototype);
+R3.Controls.D3.prototype.constructor = R3.Controls.D3;
+
+R3.Controls.D3.prototype.updateInstance = function(property) {
+
+    if (property === 'camera') {
+        console.warn('update camera instance update');
+        return;
+    }
+
+    R3.Controls.prototype.updateInstance.call(this, property);
+
+};
\ No newline at end of file
diff --git a/src/r3-controls-keyboard.js b/src/r3-controls-keyboard.js
index c949be4..d54b4e2 100644
--- a/src/r3-controls-keyboard.js
+++ b/src/r3-controls-keyboard.js
@@ -1,26 +1,24 @@
 /**
- * Keyboard Controls
- * @param apiKeyboardControls R3.API.Controls
+ * R3.Controls.Keyboard is an R3.Controls
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Controls.Keyboard = function(
-    apiKeyboardControls
+    parent,
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiKeyboardControls)) {
-        apiKeyboardControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_KEYBOARD
-        };
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.Keyboard.call(
         this,
-        apiKeyboardControls
+        apiComponent
     );
 
 	R3.Controls.call(
         this,
-        apiKeyboardControls
+        parent
     );
 };
 
@@ -36,11 +34,8 @@ R3.Controls.Keyboard.prototype.constructor = R3.Controls.Keyboard;
  * @returns
  */
 R3.Controls.Keyboard.prototype.createInstance = function() {
-    /**
-     * Set instance to true to indicate no dependencies to other components
-     */
     this.instance = true;
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -49,31 +44,3 @@ R3.Controls.Keyboard.prototype.createInstance = function() {
 R3.Controls.Keyboard.prototype.updateInstance = function(property) {
 	R3.Controls.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Controls.Keyboard to a R3.API.Controls
- * @returns {R3.API.Controls}
- */
-R3.Controls.Keyboard.prototype.toApiObject = function() {
-	var apiControls = R3.Controls.prototype.toApiObject.call(this);
-    /**
-     * add other properties here as this component develops...
-     */
-	return apiControls;
-};
-
-/**
- * Construct an Keyboard Controls object from data
- * @param objectControls
- * @returns {R3.Controls.Keyboard}
- * @constructor
- */
-R3.Controls.Keyboard.FromObject = function(objectControls) {
-
-	var apiKeyboardControls = R3.API.Controls.Keyboard.FromObject(objectControls);
-
-	return new R3.Controls.Keyboard(
-		apiKeyboardControls
-    );
-
-};
\ No newline at end of file
diff --git a/src/r3-controls-mouse.js b/src/r3-controls-mouse.js
index ff52f7a..24c0ac7 100644
--- a/src/r3-controls-mouse.js
+++ b/src/r3-controls-mouse.js
@@ -1,26 +1,24 @@
 /**
- * Mouse Controls
- * @param apiMouseControls R3.API.Controls
+ * R3.Controls.Mouse
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.Controls.Mouse = function(
-    apiMouseControls
+    parent,
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiMouseControls)) {
-        apiMouseControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_MOUSE
-        };
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.Mouse.call(
         this,
-        apiMouseControls
+        apiComponent
     );
 
     R3.Controls.call(
         this,
-        apiMouseControls
+        parent
     );
 };
 
@@ -36,11 +34,8 @@ R3.Controls.Mouse.prototype.constructor = R3.Controls.Mouse;
  * @returns
  */
 R3.Controls.Mouse.prototype.createInstance = function() {
-    /**
-     * Set instance to true to indicate no dependencies to other components
-     */
     this.instance = true;
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -49,31 +44,3 @@ R3.Controls.Mouse.prototype.createInstance = function() {
 R3.Controls.Mouse.prototype.updateInstance = function(property) {
 	R3.Controls.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Controls.Mouse to a R3.API.Controls
- * @returns {R3.API.Controls}
- */
-R3.Controls.Mouse.prototype.toApiObject = function() {
-	var apiControls = R3.Controls.prototype.toApiObject.call(this);
-    /**
-     * add other properties here as this component develops...
-     */
-	return apiControls;
-};
-
-/**
- * Construct an Mouse Controls object from data
- * @param objectControls
- * @returns {R3.Controls.Mouse}
- * @constructor
- */
-R3.Controls.Mouse.FromObject = function(objectControls) {
-
-	var apiMouseControls = R3.API.Controls.Mouse.FromObject(objectControls);
-
-	return new R3.Controls.Mouse(
-		apiMouseControls
-    );
-
-};
\ No newline at end of file
diff --git a/src/r3-controls-touch.js b/src/r3-controls-touch.js
index 4770d55..e64b4b8 100644
--- a/src/r3-controls-touch.js
+++ b/src/r3-controls-touch.js
@@ -1,28 +1,27 @@
 /**
  * Touch Controls
  * @constructor
- * @param apiTouchControls
+ * @param parent
+ * @param apiComponent
  */
 R3.Controls.Touch = function(
-    apiTouchControls
+    parent,
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiTouchControls)) {
-        apiTouchControls = {
-            controlsType : R3.API.Controls.CONTROLS_TYPE_TOUCH
-        };
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.API.Controls.Touch.call(
         this,
-        apiTouchControls,
-        apiTouchControls.sensitivity
+        apiComponent,
+        apiComponent.sensitivity
     );
 
     R3.Controls.call(
         this,
-        apiTouchControls
+        parent
     );
+
 };
 
 /**
@@ -37,11 +36,8 @@ R3.Controls.Touch.prototype.constructor = R3.Controls.Touch;
  * @returns
  */
 R3.Controls.Touch.prototype.createInstance = function() {
-    /**
-     * Set instance to true to indicate no dependencies to other components
-     */
     this.instance = true;
-    R3.Controls.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -50,33 +46,3 @@ R3.Controls.Touch.prototype.createInstance = function() {
 R3.Controls.Touch.prototype.updateInstance = function(property) {
 	R3.Controls.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Controls.Touch to a R3.API.Controls
- * @returns {R3.API.Controls}
- */
-R3.Controls.Touch.prototype.toApiObject = function() {
-
-    var apiControls = R3.Controls.prototype.toApiObject.call(this);
-
-	apiControls.sensitivity = this.sensitivity;
-
-    /**
-     * add other properties here as this component develops...
-     */
-	return apiControls;
-};
-
-/**
- * Construct an Touch Controls object from data
- * @param objectControls
- * @returns {R3.Controls.Touch}
- * @constructor
- */
-R3.Controls.Touch.FromObject = function(objectControls) {
-
-	var apiTouchControls = R3.API.Controls.Touch.FromObject(objectControls);
-
-	return new R3.Controls.Touch(apiTouchControls);
-
-};
\ No newline at end of file
diff --git a/src/r3-curve-a.js b/src/r3-curve-a.js
index d09347b..f1df359 100644
--- a/src/r3-curve-a.js
+++ b/src/r3-curve-a.js
@@ -1,43 +1,53 @@
 /**
  * R3.Curve
- * @param graphics R3.GraphicsRuntime
- * @param apiCurve R3.API.Curve
- * @property curveType
+ * @param parent
+ * @param apiComponent
+ * @param linkedObjects
  * @constructor
  */
 R3.Curve = function(
-    graphics,
-    apiCurve
+    parent,
+    apiComponent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+
+        /**
+         * This class behaves in such a way that we can create instances from it - we define the runtime and construct
+         * the api object and upgrade its properties (if any) to runtime
+         */
+
+        __RUNTIME_COMPONENT_MACRO__;
+
+        R3.API.Curve.call(
+            this,
+            apiComponent,
+            apiComponent.arcLenghDivisions
+        );
+
+        R3.Component.call(
+            this,
+            parent
+        );
+
+    } else {
+
+        /**
+         * This class was inherited and Component constructor will call the child class createInstance()
+         * Add any more linking information to the linkedObjects object here
+         */
+
+        R3.Component.call(
+            this,
+            parent,
+            linkedObjects
+        );
 
-    if (R3.Utils.UndefinedOrNull(apiCurve)) {
-        apiCurve = {};
     }
 
-    R3.API.Curve.call(
-        this,
-        apiCurve.id,
-        apiCurve.name,
-        apiCurve.curveType,
-        apiCurve.parent,
-        apiCurve.arcLenghDivisions
-    );
 
-    var linkedObjects = {};
 
-    switch (this.curveType) {
-        case R3.API.Curve.CURVE_TYPE_PATH :
-            linkedObjects.curves = [R3.Curve];
-            break;
-    }
-
-    R3.Component.call(
-        this,
-        linkedObjects
-    );
 };
 
 R3.Curve.prototype = Object.create(R3.Component.prototype);
@@ -47,14 +57,7 @@ R3.Curve.prototype.constructor = R3.Curve;
  * Create Instance
  */
 R3.Curve.prototype.createInstance = function() {
-
-    if (R3.Utils.UndefinedOrNull(this.instance)) {
-        console.warn('you should not instantiate this curve object directly');
-        this.instance = new THREE.Curve();
-    }
-
-    this.instance.arcLenghDivisions = this.arcLenghDivisions;
-
+    this.instance = this.graphics.Curve(this.arcLenghDivisions);
     R3.Component.prototype.createInstance.call(this);
 };
 
@@ -65,23 +68,8 @@ R3.Curve.prototype.updateInstance = function(property) {
 
     if (property === 'arcLenghDivisions') {
         this.instance.arcLenghDivisions = this.arcLenghDivisions;
+        return;
     }
 
     R3.Component.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Curve to a new R3.API.Curve
- * @returns {R3.API.Curve}
- */
-R3.Curve.prototype.toApiObject = function() {
-
-    return new R3.API.Curve(
-        this.id,
-        this.name,
-        this.curveType,
-        R3.Utils.IdOrNull(this.parent),
-        this.arcLenghDivisions
-    );
-
-};
diff --git a/src/r3-curve-path-a.js b/src/r3-curve-path-a.js
index a6a74df..4ea2f99 100644
--- a/src/r3-curve-path-a.js
+++ b/src/r3-curve-path-a.js
@@ -1,47 +1,70 @@
 /**
  * R3.Curve.Path
- * @param graphics R3.GraphicsRuntime
- * @param apiCurvePath
  * @constructor
+ * @param parent
+ * @param apiComponent
+ * @param linkedObjects
  */
 R3.Curve.Path = function(
-	graphics,
-	apiCurvePath
+    parent,
+    apiComponent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
 
-    if (R3.Utils.UndefinedOrNull(apiCurvePath)) {
-        apiCurvePath = {
-            curveType : R3.API.Curve.CURVE_TYPE_PATH
+        /**
+         * This class behaves in such a way that we can create instances from it - we define the runtime and construct
+         * the api object and upgrade its properties to runtime
+         */
+
+        __RUNTIME_COMPONENT_MACRO__;
+
+        R3.API.Curve.Path.call(
+            this,
+            apiComponent,
+            apiComponent.curves,
+            apiComponent.autoClose
+        );
+
+        this.curves = this.curves.reduce(
+            function(result, curve) {
+
+                if (curve instanceof R3.API.Component) {
+                    curve = R3.Component.ConstructFromObject(curve);
+                }
+
+                result.push(curve);
+
+                return result;
+            },
+            []
+        );
+
+        linkedObjects = {
+            curves : [R3.Curve]
         };
+
+    } else {
+
+        /**
+         * This class was inherited and Component constructor will call the child class createInstance()
+         * Add any more linking information to the linkedObjects object here - and pass up the inheritence chain
+         * so more linking information can be attached
+         */
+        linkedObjects.curves = [R3.Curve];
     }
 
-    R3.API.Curve.Path.call(
-        this,
-        apiCurvePath,
-        apiCurvePath.curves,
-        apiCurvePath.autoClose
-    );
-
-    this.curves = this.curves.map(
-        function(curve) {
-            if (curve instanceof R3.API.Curve) {
-                return new R3.Curve(
-                    this.graphics,
-                    curve
-                );
-            }
-        }.bind(this)
-    );
-
+    /**
+     * Now we call the parent class but with linkedObjects - indicating that its being called from a child class
+     * and should not do any runtime instantiation
+     */
     R3.Curve.call(
         this,
-        this.graphics,
-        this
-    );
-    
+        parent,
+        apiComponent,
+        linkedObjects
+    )
 };
 
 R3.Curve.Path.prototype = Object.create(R3.Curve.prototype);
@@ -53,20 +76,9 @@ R3.Curve.Path.prototype.constructor = R3.Curve.Path;
  */
 R3.Curve.Path.prototype.createInstance = function() {
 
-    if (R3.Utils.UndefinedOrNull(this.instance)) {
-        console.warn('you should not instantiate this curve object directly');
-        this.instance = new THREE.CurvePath();
-    }
+    this.instance = this.graphics.CurvePath(this.curves, this.autoClose);
 
-    this.instance.curves = this.curves.map(
-        function(curve) {
-            return curve.instance;
-        }
-    );
-
-    this.instance.autoClose = this.autoClose;
-
-    R3.Curve.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -86,24 +98,3 @@ R3.Curve.Path.prototype.updateInstance = function(property) {
         
     R3.Curve.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Curve to a R3.API.Curve
- * @returns {R3.API.Curve}
- */
-R3.Curve.Path.prototype.toApiObject = function() {
-
-    var apiCurve = R3.Curve.prototype.toApiObject.call(this);
-
-    var apiCurvePath = new R3.API.Curve.Path(
-        apiCurve,
-        this.curves.map(
-            function(curve) {
-                return R3.Utils.IdOrNull(curve);
-            }
-        ),
-        this.autoClose
-    );
-
-    return apiCurvePath;
-};
diff --git a/src/r3-curve-path-d2-a.js b/src/r3-curve-path-d2-a.js
index 12c1b2b..23dd701 100644
--- a/src/r3-curve-path-d2-a.js
+++ b/src/r3-curve-path-d2-a.js
@@ -1,43 +1,73 @@
 /**
  * R3.Curve.Path.D2
- * @param graphics R3.GraphicsRuntime
- * @param apiCurvePath
+ * @param parent
+ * @param apiComponent
+ * @param linkedObjects
  * @constructor
  */
 R3.Curve.Path.D2 = function(
-	graphics,
-	apiCurvePath
+	parent,
+    apiComponent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
 
-    if (R3.Utils.UndefinedOrNull(apiCurvePath)) {
-        apiCurvePath = {
-            curveType : R3.API.Curve.CURVE_TYPE_PATH_2D
-        };
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+
+        /**
+         * This class behaves in such a way that we can create instances from it - we define the runtime and construct
+         * the api object and upgrade its properties to runtime
+         */
+
+        __RUNTIME_COMPONENT_MACRO__;
+
+        R3.API.Curve.Path.D2.call(
+            this,
+            apiComponent,
+            apiComponent.points
+        );
+
+    } else {
+
+        /**
+         * This class was inherited and Component constructor will call the child class createInstance()
+         * Add any more linking information to the linkedObjects object here -
+         * Points aren't components so they don't get added to linkedObjects
+         * @type {R3.Vector2}
+         */
+
     }
 
-    R3.API.Curve.Path.D2.call(
-        this,
-        apiCurvePath,
-        apiCurvePath.points
-    );
+    this.points = this.points.reduce(
+        function(result, point) {
 
-    this.points = this.points.map(
-        function(point) {
-            return new R3.Vector2(
-                this.graphics,
+            /**
+             * Points aren't components so they don't get added to linkedObjects
+             * @type {R3.Vector2}
+             */
+            point = new R3.Vector2(
+                this,
                 point
             );
-        }.bind(this)
+
+            result.push(point);
+
+            return result;
+        },
+        []
     );
 
+    /**
+     * Now we call the parent class but with linkedObjects - indicating that its being called from a child class
+     * and should not do any runtime instantiation
+     */
     R3.Curve.Path.call(
         this,
-        this.graphics,
-        this
+        parent,
+        apiComponent,
+        linkedObjects
     );
+
     
 };
 
@@ -50,17 +80,9 @@ R3.Curve.Path.D2.prototype.constructor = R3.Curve.Path.D2;
  */
 R3.Curve.Path.D2.prototype.createInstance = function() {
 
-    if (R3.Utils.UndefinedOrNull(this.instance)) {
-        this.instance = new THREE.Path(
-            this.points.map(
-                function(point) {
-                    return point.instance;
-                }
-            )
-        );
-    }
+    this.instance = this.graphics.Path(this.points);
 
-    R3.Curve.Path.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -70,32 +92,7 @@ R3.Curve.Path.D2.prototype.updateInstance = function(property) {
 
     if (property === 'points') {
         console.warn('todo: update points (and test it)');
-        this.instance.points = this.points.map(
-            function(point) {
-                return point.instance;
-            }
-        );
-        return;
     }
         
     R3.Curve.Path.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Curve to a R3.API.Curve
- * @returns {R3.API.Curve}
- */
-R3.Curve.Path.D2.prototype.toApiObject = function() {
-
-    var apiCurvePath = R3.Curve.Path.prototype.toApiObject.call(this);
-
-    return new R3.API.Curve.Path.D2(
-        apiCurvePath,
-        this.points.map(
-            function(point) {
-                return point.toApiObject();
-            }
-        )
-    );
-
-};
diff --git a/src/r3-curve-path-d2-shape.js b/src/r3-curve-path-d2-shape.js
index 0249956..0a9d9fe 100644
--- a/src/r3-curve-path-d2-shape.js
+++ b/src/r3-curve-path-d2-shape.js
@@ -1,34 +1,49 @@
 /**
- * R3.Curve.Path.D2
- * @param graphics R3.GraphicsRuntime
- * @param apiCurvePathD2
+ * R3.Curve.Path.D2.Shape
+ * @param parent
+ * @param apiComponent
+ * @param linkedObjects
  * @constructor
  */
 R3.Curve.Path.D2.Shape = function(
-	graphics,
-	apiCurvePathD2
+    parent,
+    apiComponent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+
+        /**
+         * This class behaves in such a way that we can create instances from it - we define the runtime and construct
+         * the api object and upgrade its properties to runtime
+         */
+
+        __RUNTIME_COMPONENT_MACRO__;
+
+        R3.API.Curve.Path.D2.Shape.call(
+            this,
+            apiComponent
+        );
+
+    } else {
+
+        /**
+         * This class was inherited and Component constructor will call the child class createInstance()
+         * Add any more linking information to the linkedObjects object here
+         */
 
-    if (R3.Utils.UndefinedOrNull(apiCurvePathD2)) {
-        apiCurvePathD2 = {
-            curveType : R3.API.Curve.CURVE_TYPE_PATH_2D_SHAPE
-        };
     }
 
-    R3.API.Curve.Path.D2.call(
-        this,
-        apiCurvePathD2,
-        apiCurvePathD2.points
-    );
-
+    /**
+     * Now we call the parent class but with linkedObjects - indicating that its being called from a child class
+     * and should not do any runtime instantiation
+     */
     R3.Curve.Path.D2.call(
         this,
-        this.graphics,
-        this
-    );
+        parent,
+        apiComponent,
+        linkedObjects
+    )
     
 };
 
@@ -41,15 +56,9 @@ R3.Curve.Path.D2.Shape.prototype.constructor = R3.Curve.Path.D2.Shape;
  */
 R3.Curve.Path.D2.Shape.prototype.createInstance = function() {
 
-    this.instance = new THREE.Shape(
-        this.points.map(
-            function(point) {
-                return point.instance;
-            }
-        )
-    );
+    this.instance = this.graphics.Shape(this.points);
 
-    R3.Curve.Path.D2.prototype.createInstance.call(this);
+    R3.Component.prototype.createInstance.call(this);
 };
 
 /**
@@ -58,17 +67,3 @@ R3.Curve.Path.D2.Shape.prototype.createInstance = function() {
 R3.Curve.Path.D2.Shape.prototype.updateInstance = function(property) {
     R3.Curve.Path.D2.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.Curve to a R3.API.Curve
- * @returns {R3.API.Curve}
- */
-R3.Curve.Path.D2.Shape.prototype.toApiObject = function() {
-
-    var apiCurvePathD2 = R3.Curve.Path.D2.prototype.toApiObject.call(this);
-
-    return new R3.API.Curve.Path.D2.Shape(
-        apiCurvePathD2
-    );
-
-};
diff --git a/src/r3-custom-code.js b/src/r3-custom-code.js
index 3bad8d1..e0113b7 100644
--- a/src/r3-custom-code.js
+++ b/src/r3-custom-code.js
@@ -1,28 +1,29 @@
 /**
- * Creates a CustomCode object
- * @param apiCustomCode R3.API.CustomCode
+ * R3.CustomCode
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.CustomCode = function(
-	apiCustomCode
+	parent,
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiCustomCode)) {
-        apiCustomCode = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
 	R3.API.CustomCode.call(
         this,
-        apiCustomCode.id,
-        apiCustomCode.name,
-        apiCustomCode.eventId,
-        apiCustomCode.code,
-        apiCustomCode.parent
+        apiComponent,
+        apiComponent.eventId,
+        apiComponent.code,
     );
 
     this.editor = null;
 
-    R3.Component.call(this);
+    R3.Component.call(
+        this,
+        parent
+    );
 };
 
 R3.CustomCode.prototype = Object.create(R3.Component.prototype);
@@ -31,7 +32,9 @@ R3.CustomCode.prototype.constructor = R3.CustomCode;
 R3.CustomCode.prototype.createInstance = function() {
 
     try {
-		this.instance = new Function('data', this.code).bind(this);
+
+        this.instance = new Function('data', this.code).bind(this);
+
 	} catch (error) {
 		/**
 		 * Set the instance to true here to indicate that even though the compilation failed, the instance will be fine and
@@ -93,33 +96,8 @@ R3.CustomCode.prototype.updateInstance = function(property) {
     R3.Component.prototype.updateInstance.call(this, property);
 };
 
-/**
- * Converts a R3.CustomCode to a new R3.API.CustomCode
- * @returns {R3.API.CustomCode}
- */
-R3.CustomCode.prototype.toApiObject = function() {
-
-    return new R3.API.CustomCode(
-        this.id,
-        this.name,
-        this.eventId,
-        this.code,
-		R3.Utils.IdOrNull(this.parent)
-    );
-
-};
-
 R3.CustomCode.prototype.launchEditor = function(){
 
-    R3.Event.Emit(
-        R3.Event.GET_RUNTIME,
-        null,
-        function(runtime) {
-            this.coder = runtime.coder;
-            this.coder.isNotCodeMirrorThrow();
-        }.bind(this)
-    );
-
     if (this instanceof R3.D3.Shader.Vertex) {
         this.editor = this.coder.instance(
             document.body,
diff --git a/src/r3-d3-api-a-object.js b/src/r3-d3-api-0-object.js
similarity index 97%
rename from src/r3-d3-api-a-object.js
rename to src/r3-d3-api-0-object.js
index 2974177..3fc2b25 100644
--- a/src/r3-d3-api-a-object.js
+++ b/src/r3-d3-api-0-object.js
@@ -21,7 +21,7 @@ R3.D3.API.Object = function(
     lookAt
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(useQuaternion)) {
         useQuaternion = true;
diff --git a/src/r3-d3-api-animation.js b/src/r3-d3-api-animation.js
index 63761e8..ad454cf 100644
--- a/src/r3-d3-api-animation.js
+++ b/src/r3-d3-api-animation.js
@@ -23,7 +23,7 @@ R3.D3.API.Animation = function(
 	applyToMeshWhenDone
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(rotationSpeed)) {
         rotationSpeed = 0;
diff --git a/src/r3-d3-api-audio.js b/src/r3-d3-api-audio.js
index 8719e57..0a64268 100644
--- a/src/r3-d3-api-audio.js
+++ b/src/r3-d3-api-audio.js
@@ -4,8 +4,7 @@
  * @param path
  * @param loop
  * @param volume
- * @param camera
- * @param overplay
+ * @param cameraIndex
  * @param paused
  * @constructor
  */
@@ -14,12 +13,11 @@ R3.D3.API.Audio = function(
     path,
     loop,
     volume,
-    camera,
-    overplay,
+    cameraIndex,
     paused
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(path)) {
         path = '';
@@ -36,15 +34,10 @@ R3.D3.API.Audio = function(
     }
     this.volume = volume;
 
-    if (R3.Utils.UndefinedOrNull(camera)) {
-        camera = null;
+    if (R3.Utils.UndefinedOrNull(cameraIndex)) {
+        cameraIndex = R3.API.Project.CAMERA_INDEX_RUN;
     }
-    this.camera = camera;
-
-    if (R3.Utils.UndefinedOrNull(overplay)) {
-        overplay = false;
-    }
-    this.overplay = overplay;
+    this.cameraIndex = cameraIndex;
 
     if (R3.Utils.UndefinedOrNull(paused)) {
         paused = false;
diff --git a/src/r3-d3-api-bone-weight.js b/src/r3-d3-api-bone-weight.js
index 9e44156..f33cf77 100644
--- a/src/r3-d3-api-bone-weight.js
+++ b/src/r3-d3-api-bone-weight.js
@@ -1,13 +1,28 @@
 /**
- * BoneWeight object - associates a vertex to a bone with some weight
- * @param boneIndex int
- * @param weight float
+ * R3.D3.API.BoneWeight
+ * @param apiComponent
+ * @param boneIndex
+ * @param weight
  * @constructor
  */
 R3.D3.API.BoneWeight = function(
+    apiComponent,
     boneIndex,
     weight
 ) {
+
+    __API_COMPONENT_MACRO__;
+
+    if (R3.Utils.UndefinedOrNull(boneIndex)) {
+        boneIndex = 0;
+    }
     this.boneIndex = boneIndex;
+
+    if (R3.Utils.UndefinedOrNull(weight)) {
+        weight = 0;
+    }
     this.weight = weight;
 };
+
+R3.D3.API.BoneWeight.prototype = Object.create(R3.API.Component.prototype);
+R3.D3.API.BoneWeight.prototype.constructor = R3.D3.API.BoneWeight;
diff --git a/src/r3-d3-api-broadphase.js b/src/r3-d3-api-broadphase.js
index 8570921..822cd3c 100644
--- a/src/r3-d3-api-broadphase.js
+++ b/src/r3-d3-api-broadphase.js
@@ -9,7 +9,7 @@ R3.D3.API.Broadphase = function(
     broadphaseType
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(broadphaseType)) {
         broadphaseType = R3.D3.Broadphase.BROADPHASE_TYPE_NAIVE;
diff --git a/src/r3-d3-api-camera-cube.js b/src/r3-d3-api-camera-cube.js
index 41b225b..6440eef 100644
--- a/src/r3-d3-api-camera-cube.js
+++ b/src/r3-d3-api-camera-cube.js
@@ -45,7 +45,7 @@ R3.D3.API.Camera.Cube = function(
     this.cubeResolution = cubeResolution;
 
     if (R3.Utils.UndefinedOrNull(renderTarget)) {
-        renderTarget = null;
+        renderTarget = new R3.D3.API.RenderTarget.Cube();
     }
     this.renderTarget = renderTarget;
 
diff --git a/src/r3-d3-api-composer.js b/src/r3-d3-api-composer.js
index 23b0de1..f65220b 100644
--- a/src/r3-d3-api-composer.js
+++ b/src/r3-d3-api-composer.js
@@ -15,7 +15,7 @@ R3.D3.API.Composer = function(
     passes
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(autoUpdateSize)) {
         autoUpdateSize = true;
diff --git a/src/r3-d3-api-effect-a.js b/src/r3-d3-api-effect-a.js
index b8fd240..e77e856 100644
--- a/src/r3-d3-api-effect-a.js
+++ b/src/r3-d3-api-effect-a.js
@@ -14,7 +14,7 @@ R3.D3.API.Effect = function(
     height
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 512;
diff --git a/src/r3-d3-api-face.js b/src/r3-d3-api-face.js
index 7354ba3..7493177 100644
--- a/src/r3-d3-api-face.js
+++ b/src/r3-d3-api-face.js
@@ -27,7 +27,7 @@ R3.D3.API.Face = function(
     selected
 ) {
 
-	__API_COMPONENT_MACRO__
+	__API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(v0index)) {
 		v0index = -1;
diff --git a/src/r3-d3-api-fog.js b/src/r3-d3-api-fog.js
index 9ff0ea0..ea8189a 100644
--- a/src/r3-d3-api-fog.js
+++ b/src/r3-d3-api-fog.js
@@ -17,7 +17,7 @@ R3.D3.API.Fog = function(
     density
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(exponential)) {
         exponential = false;
diff --git a/src/r3-d3-api-font.js b/src/r3-d3-api-font.js
index 3cc8e2e..f10a36e 100644
--- a/src/r3-d3-api-font.js
+++ b/src/r3-d3-api-font.js
@@ -9,7 +9,7 @@ R3.D3.API.Font = function(
     path
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(path)) {
         path = '';
diff --git a/src/r3-d3-api-friction-contact-material.js b/src/r3-d3-api-friction-contact-material.js
index 70bc262..61d951d 100644
--- a/src/r3-d3-api-friction-contact-material.js
+++ b/src/r3-d3-api-friction-contact-material.js
@@ -21,7 +21,7 @@ R3.D3.API.FrictionContactMaterial = function(
     frictionEquationRelaxation
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(materials)) {
         materials = [];
diff --git a/src/r3-d3-api-friction-material.js b/src/r3-d3-api-friction-material.js
index a3f26ef..9b5e770 100644
--- a/src/r3-d3-api-friction-material.js
+++ b/src/r3-d3-api-friction-material.js
@@ -11,7 +11,7 @@ R3.D3.API.FrictionMaterial = function(
 	restitution
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(friction)) {
         friction = -1;
diff --git a/src/r3-d3-api-geometry-a.js b/src/r3-d3-api-geometry-a.js
index 745a128..d3a52b3 100644
--- a/src/r3-d3-api-geometry-a.js
+++ b/src/r3-d3-api-geometry-a.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry = function(
     vertices
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(boundingBox)) {
         boundingBox = new R3.API.Box3();
diff --git a/src/r3-d3-api-geometry-buffer-box.js b/src/r3-d3-api-geometry-buffer-box.js
index fafea83..075adb5 100644
--- a/src/r3-d3-api-geometry-buffer-box.js
+++ b/src/r3-d3-api-geometry-buffer-box.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Buffer.Box = function(
     depthSegments
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 1;
diff --git a/src/r3-d3-api-geometry-buffer-circle.js b/src/r3-d3-api-geometry-buffer-circle.js
index 628c06e..5290072 100644
--- a/src/r3-d3-api-geometry-buffer-circle.js
+++ b/src/r3-d3-api-geometry-buffer-circle.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Buffer.Circle = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-cone.js b/src/r3-d3-api-geometry-buffer-cone.js
index 6969b5c..1475610 100644
--- a/src/r3-d3-api-geometry-buffer-cone.js
+++ b/src/r3-d3-api-geometry-buffer-cone.js
@@ -21,7 +21,7 @@ R3.D3.API.Geometry.Buffer.Cone = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-cylinder.js b/src/r3-d3-api-geometry-buffer-cylinder.js
index bd2628c..dcefebb 100644
--- a/src/r3-d3-api-geometry-buffer-cylinder.js
+++ b/src/r3-d3-api-geometry-buffer-cylinder.js
@@ -23,7 +23,7 @@ R3.D3.API.Geometry.Buffer.Cylinder = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radiusTop)) {
         radiusTop = 1;
diff --git a/src/r3-d3-api-geometry-buffer-dodecahedron.js b/src/r3-d3-api-geometry-buffer-dodecahedron.js
index 5446a5e..22a652d 100644
--- a/src/r3-d3-api-geometry-buffer-dodecahedron.js
+++ b/src/r3-d3-api-geometry-buffer-dodecahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Buffer.Dodecahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-extrude.js b/src/r3-d3-api-geometry-buffer-extrude.js
index c2235cc..e76d2ed 100644
--- a/src/r3-d3-api-geometry-buffer-extrude.js
+++ b/src/r3-d3-api-geometry-buffer-extrude.js
@@ -29,7 +29,7 @@ R3.D3.API.Geometry.Buffer.Extrude = function(
     UVGenerator
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(shapes)) {
         shapes = [];
diff --git a/src/r3-d3-api-geometry-buffer-icosahedron.js b/src/r3-d3-api-geometry-buffer-icosahedron.js
index 328a11f..340caf7 100644
--- a/src/r3-d3-api-geometry-buffer-icosahedron.js
+++ b/src/r3-d3-api-geometry-buffer-icosahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Buffer.Icosahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-instanced.js b/src/r3-d3-api-geometry-buffer-instanced.js
index 6f5849a..93dca19 100644
--- a/src/r3-d3-api-geometry-buffer-instanced.js
+++ b/src/r3-d3-api-geometry-buffer-instanced.js
@@ -9,7 +9,7 @@ R3.D3.API.Geometry.Buffer.Instanced = function(
     maxInstancedCount
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(maxInstancedCount)) {
         maxInstancedCount = null;
diff --git a/src/r3-d3-api-geometry-buffer-lathe.js b/src/r3-d3-api-geometry-buffer-lathe.js
index c6bd9b1..3e2ba7b 100644
--- a/src/r3-d3-api-geometry-buffer-lathe.js
+++ b/src/r3-d3-api-geometry-buffer-lathe.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Buffer.Lathe = function(
     phiLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(points)) {
         points = [];
diff --git a/src/r3-d3-api-geometry-buffer-octahedron.js b/src/r3-d3-api-geometry-buffer-octahedron.js
index 2300e59..b863689 100644
--- a/src/r3-d3-api-geometry-buffer-octahedron.js
+++ b/src/r3-d3-api-geometry-buffer-octahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Buffer.Octahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-parametric.js b/src/r3-d3-api-geometry-buffer-parametric.js
index 232b519..65c5fc5 100644
--- a/src/r3-d3-api-geometry-buffer-parametric.js
+++ b/src/r3-d3-api-geometry-buffer-parametric.js
@@ -13,7 +13,7 @@ R3.D3.API.Geometry.Buffer.Parametric = function(
     stacks
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(generatorFn)) {
         generatorFn = '';
diff --git a/src/r3-d3-api-geometry-buffer-plane.js b/src/r3-d3-api-geometry-buffer-plane.js
index 227ef77..0a2d413 100644
--- a/src/r3-d3-api-geometry-buffer-plane.js
+++ b/src/r3-d3-api-geometry-buffer-plane.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Buffer.Plane = function(
     heightSegments
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 1;
diff --git a/src/r3-d3-api-geometry-buffer-polyhedron.js b/src/r3-d3-api-geometry-buffer-polyhedron.js
index f392036..562a3d1 100644
--- a/src/r3-d3-api-geometry-buffer-polyhedron.js
+++ b/src/r3-d3-api-geometry-buffer-polyhedron.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Buffer.Polyhedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(vertices)) {
         vertices = [];
diff --git a/src/r3-d3-api-geometry-buffer-ring.js b/src/r3-d3-api-geometry-buffer-ring.js
index 6a3009b..d2aed7c 100644
--- a/src/r3-d3-api-geometry-buffer-ring.js
+++ b/src/r3-d3-api-geometry-buffer-ring.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Buffer.Ring = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(innerRadius)) {
         innerRadius = 0.5;
diff --git a/src/r3-d3-api-geometry-buffer-shape.js b/src/r3-d3-api-geometry-buffer-shape.js
index 789acf8..339c652 100644
--- a/src/r3-d3-api-geometry-buffer-shape.js
+++ b/src/r3-d3-api-geometry-buffer-shape.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Buffer.Shape = function(
     curveSegments
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(shapes)) {
         shapes = [];
diff --git a/src/r3-d3-api-geometry-buffer-sphere.js b/src/r3-d3-api-geometry-buffer-sphere.js
index dfe482a..7f8604e 100644
--- a/src/r3-d3-api-geometry-buffer-sphere.js
+++ b/src/r3-d3-api-geometry-buffer-sphere.js
@@ -21,7 +21,7 @@ R3.D3.API.Geometry.Buffer.Sphere = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-tetrahedron.js b/src/r3-d3-api-geometry-buffer-tetrahedron.js
index f6b153b..9a531f4 100644
--- a/src/r3-d3-api-geometry-buffer-tetrahedron.js
+++ b/src/r3-d3-api-geometry-buffer-tetrahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Buffer.Tetrahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-text.js b/src/r3-d3-api-geometry-buffer-text.js
index c418236..bdb91a3 100644
--- a/src/r3-d3-api-geometry-buffer-text.js
+++ b/src/r3-d3-api-geometry-buffer-text.js
@@ -25,7 +25,7 @@ R3.D3.API.Geometry.Buffer.Text = function(
     bevelSegments
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(text)) {
         text = '-=<yb4f310';
diff --git a/src/r3-d3-api-geometry-buffer-torus-knot.js b/src/r3-d3-api-geometry-buffer-torus-knot.js
index f7aacc1..35a51b6 100644
--- a/src/r3-d3-api-geometry-buffer-torus-knot.js
+++ b/src/r3-d3-api-geometry-buffer-torus-knot.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Buffer.TorusKnot = function(
     q
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-torus.js b/src/r3-d3-api-geometry-buffer-torus.js
index ce3f587..0956ddf 100644
--- a/src/r3-d3-api-geometry-buffer-torus.js
+++ b/src/r3-d3-api-geometry-buffer-torus.js
@@ -17,7 +17,7 @@ R3.D3.API.Geometry.Buffer.Torus = function(
     arc
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-buffer-tube.js b/src/r3-d3-api-geometry-buffer-tube.js
index 2f73547..fa14f04 100644
--- a/src/r3-d3-api-geometry-buffer-tube.js
+++ b/src/r3-d3-api-geometry-buffer-tube.js
@@ -17,7 +17,7 @@ R3.D3.API.Geometry.Buffer.Tube = function(
     closed
 ) {
 
-    __API_GEOMETRY_BUFFER_MACRO__
+    __API_GEOMETRY_BUFFER_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(path)) {
         path = null;
diff --git a/src/r3-d3-api-geometry-normal-box.js b/src/r3-d3-api-geometry-normal-box.js
index e7961e9..8c78948 100644
--- a/src/r3-d3-api-geometry-normal-box.js
+++ b/src/r3-d3-api-geometry-normal-box.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Normal.Box = function(
     depthSegments
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 1;
diff --git a/src/r3-d3-api-geometry-normal-circle.js b/src/r3-d3-api-geometry-normal-circle.js
index 9942982..37a6167 100644
--- a/src/r3-d3-api-geometry-normal-circle.js
+++ b/src/r3-d3-api-geometry-normal-circle.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Normal.Circle = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-cone.js b/src/r3-d3-api-geometry-normal-cone.js
index d92d7c4..9404ee3 100644
--- a/src/r3-d3-api-geometry-normal-cone.js
+++ b/src/r3-d3-api-geometry-normal-cone.js
@@ -21,7 +21,7 @@ R3.D3.API.Geometry.Normal.Cone = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-cylinder.js b/src/r3-d3-api-geometry-normal-cylinder.js
index 3653c12..0aa25ac 100644
--- a/src/r3-d3-api-geometry-normal-cylinder.js
+++ b/src/r3-d3-api-geometry-normal-cylinder.js
@@ -23,7 +23,7 @@ R3.D3.API.Geometry.Normal.Cylinder = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radiusTop)) {
         radiusTop = 1;
diff --git a/src/r3-d3-api-geometry-normal-dodecahedron.js b/src/r3-d3-api-geometry-normal-dodecahedron.js
index 595d7fa..ec97d17 100644
--- a/src/r3-d3-api-geometry-normal-dodecahedron.js
+++ b/src/r3-d3-api-geometry-normal-dodecahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Dodecahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-edges.js b/src/r3-d3-api-geometry-normal-edges.js
index d20a9e9..3a4e5ef 100644
--- a/src/r3-d3-api-geometry-normal-edges.js
+++ b/src/r3-d3-api-geometry-normal-edges.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Edges = function(
     thresholdAngle
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(geometry)) {
         geometry = null;
diff --git a/src/r3-d3-api-geometry-normal-extrude.js b/src/r3-d3-api-geometry-normal-extrude.js
index 9e7149c..e7a544e 100644
--- a/src/r3-d3-api-geometry-normal-extrude.js
+++ b/src/r3-d3-api-geometry-normal-extrude.js
@@ -29,7 +29,7 @@ R3.D3.API.Geometry.Normal.Extrude = function(
     UVGenerator
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(shapes)) {
         shapes = [];
diff --git a/src/r3-d3-api-geometry-normal-icosahedron.js b/src/r3-d3-api-geometry-normal-icosahedron.js
index e33e4f7..b371aaa 100644
--- a/src/r3-d3-api-geometry-normal-icosahedron.js
+++ b/src/r3-d3-api-geometry-normal-icosahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Icosahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-lathe.js b/src/r3-d3-api-geometry-normal-lathe.js
index ec96c5c..1b38fc9 100644
--- a/src/r3-d3-api-geometry-normal-lathe.js
+++ b/src/r3-d3-api-geometry-normal-lathe.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Normal.Lathe = function(
     phiLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(points)) {
         points = [];
diff --git a/src/r3-d3-api-geometry-normal-octahedron.js b/src/r3-d3-api-geometry-normal-octahedron.js
index 2fc97d5..9aff049 100644
--- a/src/r3-d3-api-geometry-normal-octahedron.js
+++ b/src/r3-d3-api-geometry-normal-octahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Octahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-parametric.js b/src/r3-d3-api-geometry-normal-parametric.js
index 643ec3c..9bded42 100644
--- a/src/r3-d3-api-geometry-normal-parametric.js
+++ b/src/r3-d3-api-geometry-normal-parametric.js
@@ -13,7 +13,7 @@ R3.D3.API.Geometry.Normal.Parametric = function(
     stacks
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(generatorFn)) {
         generatorFn = '';
diff --git a/src/r3-d3-api-geometry-normal-plane.js b/src/r3-d3-api-geometry-normal-plane.js
index 594cc6f..191e31d 100644
--- a/src/r3-d3-api-geometry-normal-plane.js
+++ b/src/r3-d3-api-geometry-normal-plane.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Normal.Plane = function(
     heightSegments
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 1;
diff --git a/src/r3-d3-api-geometry-normal-polyhedron.js b/src/r3-d3-api-geometry-normal-polyhedron.js
index a55983c..832ec82 100644
--- a/src/r3-d3-api-geometry-normal-polyhedron.js
+++ b/src/r3-d3-api-geometry-normal-polyhedron.js
@@ -15,7 +15,7 @@ R3.D3.API.Geometry.Normal.Polyhedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(vertices)) {
         vertices = [];
diff --git a/src/r3-d3-api-geometry-normal-ring.js b/src/r3-d3-api-geometry-normal-ring.js
index 7a2d2b8..8904180 100644
--- a/src/r3-d3-api-geometry-normal-ring.js
+++ b/src/r3-d3-api-geometry-normal-ring.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Normal.Ring = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(innerRadius)) {
         innerRadius = 0.5;
diff --git a/src/r3-d3-api-geometry-normal-shape.js b/src/r3-d3-api-geometry-normal-shape.js
index 61dda35..08cf04b 100644
--- a/src/r3-d3-api-geometry-normal-shape.js
+++ b/src/r3-d3-api-geometry-normal-shape.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Shape = function(
     curveSegments
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(shapes)) {
         shapes = [];
diff --git a/src/r3-d3-api-geometry-normal-sphere.js b/src/r3-d3-api-geometry-normal-sphere.js
index 5574e2d..81177cf 100644
--- a/src/r3-d3-api-geometry-normal-sphere.js
+++ b/src/r3-d3-api-geometry-normal-sphere.js
@@ -21,7 +21,7 @@ R3.D3.API.Geometry.Normal.Sphere = function(
     thetaLength
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-tetrahedron.js b/src/r3-d3-api-geometry-normal-tetrahedron.js
index 1275def..81443ca 100644
--- a/src/r3-d3-api-geometry-normal-tetrahedron.js
+++ b/src/r3-d3-api-geometry-normal-tetrahedron.js
@@ -11,7 +11,7 @@ R3.D3.API.Geometry.Normal.Tetrahedron = function(
     detail
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-text.js b/src/r3-d3-api-geometry-normal-text.js
index 4c7afd7..4fc5715 100644
--- a/src/r3-d3-api-geometry-normal-text.js
+++ b/src/r3-d3-api-geometry-normal-text.js
@@ -25,7 +25,7 @@ R3.D3.API.Geometry.Normal.Text = function(
     bevelSegments
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(text)) {
         text = '-=<yb4f310';
diff --git a/src/r3-d3-api-geometry-normal-torus-knot.js b/src/r3-d3-api-geometry-normal-torus-knot.js
index 1739e67..a7ff6bc 100644
--- a/src/r3-d3-api-geometry-normal-torus-knot.js
+++ b/src/r3-d3-api-geometry-normal-torus-knot.js
@@ -19,7 +19,7 @@ R3.D3.API.Geometry.Normal.TorusKnot = function(
     q
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-torus.js b/src/r3-d3-api-geometry-normal-torus.js
index b0f7af6..48da10f 100644
--- a/src/r3-d3-api-geometry-normal-torus.js
+++ b/src/r3-d3-api-geometry-normal-torus.js
@@ -17,7 +17,7 @@ R3.D3.API.Geometry.Normal.Torus = function(
     arc
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(radius)) {
         radius = 1;
diff --git a/src/r3-d3-api-geometry-normal-tube.js b/src/r3-d3-api-geometry-normal-tube.js
index 08bb315..a1e1dd6 100644
--- a/src/r3-d3-api-geometry-normal-tube.js
+++ b/src/r3-d3-api-geometry-normal-tube.js
@@ -17,7 +17,7 @@ R3.D3.API.Geometry.Normal.Tube = function(
     closed
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(path)) {
         path = null;
diff --git a/src/r3-d3-api-geometry-normal-wireframe.js b/src/r3-d3-api-geometry-normal-wireframe.js
index 0af4787..8a84e61 100644
--- a/src/r3-d3-api-geometry-normal-wireframe.js
+++ b/src/r3-d3-api-geometry-normal-wireframe.js
@@ -9,7 +9,7 @@ R3.D3.API.Geometry.Normal.Wireframe = function(
     geometry
 ) {
 
-    __API_GEOMETRY_NORMAL_MACRO__
+    __API_GEOMETRY_NORMAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(geometry)) {
         geometry = null;
diff --git a/src/r3-d3-api-light-a.js b/src/r3-d3-api-light-a.js
index b75be34..d72566a 100644
--- a/src/r3-d3-api-light-a.js
+++ b/src/r3-d3-api-light-a.js
@@ -11,7 +11,7 @@ R3.D3.API.Light = function(
     intensity
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(color)) {
         color = new R3.API.Color(this, 1,1,1);
diff --git a/src/r3-d3-api-material-a.js b/src/r3-d3-api-material-a.js
index 1871e58..46b0a90 100644
--- a/src/r3-d3-api-material-a.js
+++ b/src/r3-d3-api-material-a.js
@@ -78,7 +78,7 @@ R3.D3.API.Material = function(
     visible
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(parentMeshes)) {
         parentMeshes = [];
diff --git a/src/r3-d3-api-material-basic.js b/src/r3-d3-api-material-basic.js
index 63c590a..86fd699 100644
--- a/src/r3-d3-api-material-basic.js
+++ b/src/r3-d3-api-material-basic.js
@@ -43,7 +43,7 @@ R3.D3.API.Material.Basic = function(
     wireframeLinewidth
 ) {
 
-    __API_MATERIAL_MACRO__
+    __API_MATERIAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(alphaMap)) {
         alphaMap = null;
diff --git a/src/r3-d3-api-material-phong.js b/src/r3-d3-api-material-phong.js
index 546e910..90860b8 100644
--- a/src/r3-d3-api-material-phong.js
+++ b/src/r3-d3-api-material-phong.js
@@ -69,7 +69,7 @@ R3.D3.API.Material.Phong = function(
     wireframeLinewidth
 ) {
 
-    __API_MATERIAL_MACRO__
+    __API_MATERIAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(alphaMap)) {
         alphaMap = null;
diff --git a/src/r3-d3-api-material-points.js b/src/r3-d3-api-material-points.js
index 4094993..2282f78 100644
--- a/src/r3-d3-api-material-points.js
+++ b/src/r3-d3-api-material-points.js
@@ -15,7 +15,7 @@ R3.D3.API.Material.Points = function(
     sizeAttenuation
 ) {
 
-	__API_MATERIAL_MACRO__
+	__API_MATERIAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(color)) {
         color = new R3.API.Color(this, 1, 1, 1, 1)
diff --git a/src/r3-d3-api-material-shader-a.js b/src/r3-d3-api-material-shader-a.js
index 920595c..23b5af9 100644
--- a/src/r3-d3-api-material-shader-a.js
+++ b/src/r3-d3-api-material-shader-a.js
@@ -38,7 +38,7 @@ R3.D3.API.Material.Shader = function(
     wireframeLinewidth
 ) {
 
-    __API_MATERIAL_MACRO__
+    __API_MATERIAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(clipping)) {
         clipping = false;
diff --git a/src/r3-d3-api-material-standard.js b/src/r3-d3-api-material-standard.js
index a780f94..b473987 100644
--- a/src/r3-d3-api-material-standard.js
+++ b/src/r3-d3-api-material-standard.js
@@ -69,7 +69,7 @@ R3.D3.API.Material.Standard = function(
     wireframeLinewidth
 ) {
 
-    __API_MATERIAL_MACRO__
+    __API_MATERIAL_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(alphaMap)) {
         alphaMap = null;
diff --git a/src/r3-d3-api-particle.js b/src/r3-d3-api-particle.js
index 31b0624..b67baf8 100644
--- a/src/r3-d3-api-particle.js
+++ b/src/r3-d3-api-particle.js
@@ -51,7 +51,7 @@ R3.D3.API.Particle = function(
     rotationFn
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(lifeTime)) {
         lifeTime = 10;
diff --git a/src/r3-d3-api-pass-0.js b/src/r3-d3-api-pass-0.js
index 2c97232..971f5e8 100644
--- a/src/r3-d3-api-pass-0.js
+++ b/src/r3-d3-api-pass-0.js
@@ -9,7 +9,7 @@ R3.D3.API.Pass = function(
     renderToScreen
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(renderToScreen)) {
         renderToScreen = false;
diff --git a/src/r3-d3-api-physics-world.js b/src/r3-d3-api-physics-world.js
index 0440dee..313b879 100644
--- a/src/r3-d3-api-physics-world.js
+++ b/src/r3-d3-api-physics-world.js
@@ -21,7 +21,7 @@ R3.D3.API.PhysicsWorld = function(
     defaultContactMaterial
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(gravity)) {
         gravity = new R3.API.Vector3(0, -9.81, 0);
diff --git a/src/r3-d3-api-raycast-vehicle.js b/src/r3-d3-api-raycast-vehicle.js
index 2d69e27..8f62084 100644
--- a/src/r3-d3-api-raycast-vehicle.js
+++ b/src/r3-d3-api-raycast-vehicle.js
@@ -13,7 +13,7 @@ R3.D3.API.RaycastVehicle = function(
     raycastWheels
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(chassis)) {
         chassis = null;
diff --git a/src/r3-d3-api-raycast-wheel.js b/src/r3-d3-api-raycast-wheel.js
index f409b6d..7d2bf17 100644
--- a/src/r3-d3-api-raycast-wheel.js
+++ b/src/r3-d3-api-raycast-wheel.js
@@ -37,7 +37,7 @@ R3.D3.API.RaycastWheel = function(
     useCustomSlidingRotationalSpeed
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(mesh)) {
         mesh = null;
diff --git a/src/r3-d3-api-raycaster.js b/src/r3-d3-api-raycaster.js
index 3af2a11..11a954e 100644
--- a/src/r3-d3-api-raycaster.js
+++ b/src/r3-d3-api-raycaster.js
@@ -11,7 +11,7 @@ R3.D3.API.Raycaster = function(
     direction
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(position)) {
         position = new R3.API.Vector3();
diff --git a/src/r3-d3-api-render-target-a.js b/src/r3-d3-api-render-target-a.js
index 206ec83..402ee27 100644
--- a/src/r3-d3-api-render-target-a.js
+++ b/src/r3-d3-api-render-target-a.js
@@ -1,7 +1,6 @@
 /**
  * R3.D3.API.RenderTarget
  * @param apiComponent
- * @param autoUpdateSize
  * @param width
  * @param height
  * @param scissor
@@ -11,12 +10,10 @@
  * @param depthBuffer
  * @param depthTexture
  * @param stencilBuffer
- * @param textureParameters
  * @constructor
  */
 R3.D3.API.RenderTarget = function(
     apiComponent,
-    autoUpdateSize,
     width,
     height,
     scissor,
@@ -25,16 +22,10 @@ R3.D3.API.RenderTarget = function(
     texture,
     depthBuffer,
     depthTexture,
-    stencilBuffer,
-    textureParameters
+    stencilBuffer
 ) {
 
-    __API_COMPONENT_MACRO__
-
-    if (R3.Utils.UndefinedOrNull(autoUpdateSize)) {
-        autoUpdateSize = true;
-    }
-    this.autoUpdateSize = autoUpdateSize;
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 512;
@@ -57,12 +48,12 @@ R3.D3.API.RenderTarget = function(
     this.scissorTest = scissorTest;
 
     if (R3.Utils.UndefinedOrNull(viewport)) {
-        viewport = null;
+        viewport = R3.API.Vector4(0,0,1,1);
     }
     this.viewport = viewport;
 
     if (R3.Utils.UndefinedOrNull(texture)) {
-        texture = null;
+        texture = new R3.D3.API.Texture();
     }
     this.texture = texture;
 
@@ -80,12 +71,6 @@ R3.D3.API.RenderTarget = function(
         stencilBuffer = false;
     }
     this.stencilBuffer = stencilBuffer;
-
-    if (R3.Utils.UndefinedOrNull(textureParameters)) {
-        textureParameters = null;
-    }
-    this.textureParameters = textureParameters;
-
 };
 
 R3.D3.API.RenderTarget.prototype = Object.create(R3.API.Component.prototype);
diff --git a/src/r3-d3-api-render-target-cube.js b/src/r3-d3-api-render-target-cube.js
index 3f8b245..558d249 100644
--- a/src/r3-d3-api-render-target-cube.js
+++ b/src/r3-d3-api-render-target-cube.js
@@ -8,18 +8,13 @@ R3.D3.API.RenderTarget.Cube = function(
 ) {
 
     if (R3.Utils.UndefinedOrNull(apiRenderTarget)) {
-        apiRenderTarget = {
-            textureParameters : {
-                minFilter : R3.D3.API.Texture.TYPE_LINEAR_MIPMAP_LINEAR_FILTER
-            }
-        }
+        apiRenderTarget = {}
     }
     this.apiRenderTarget = apiRenderTarget;
 
     R3.D3.API.RenderTarget.call(
         this,
         this.apiRenderTarget,
-        this.apiRenderTarget.autoUpdateSize,
         this.apiRenderTarget.width,
         this.apiRenderTarget.height,
         this.apiRenderTarget.scissor,
@@ -28,8 +23,7 @@ R3.D3.API.RenderTarget.Cube = function(
         this.apiRenderTarget.texture,
         this.apiRenderTarget.depthBuffer,
         this.apiRenderTarget.depthTexture,
-        this.apiRenderTarget.stencilBuffer,
-        this.apiRenderTarget.textureParameters
+        this.apiRenderTarget.stencilBuffer
     );
 };
 
diff --git a/src/r3-d3-api-rigid-body.js b/src/r3-d3-api-rigid-body.js
index df5df86..5269e2b 100644
--- a/src/r3-d3-api-rigid-body.js
+++ b/src/r3-d3-api-rigid-body.js
@@ -41,7 +41,7 @@ R3.D3.API.RigidBody = function(
 	kinematic
 ) {
 
-	__API_COMPONENT_MACRO__
+	__API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(mesh)) {
 		mesh = 0;
diff --git a/src/r3-d3-api-scene.js b/src/r3-d3-api-scene.js
index 9c6a413..f035829 100644
--- a/src/r3-d3-api-scene.js
+++ b/src/r3-d3-api-scene.js
@@ -41,7 +41,7 @@ R3.D3.API.Scene = function(
     controls
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(meshes)) {
         meshes = [];
diff --git a/src/r3-d3-api-shader-a.js b/src/r3-d3-api-shader-a.js
index d5b0843..90f7f8c 100644
--- a/src/r3-d3-api-shader-a.js
+++ b/src/r3-d3-api-shader-a.js
@@ -9,7 +9,7 @@ R3.D3.API.Shader = function(
     code
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(code)) {
         switch (this.componentType) {
diff --git a/src/r3-d3-api-shadow-a.js b/src/r3-d3-api-shadow-a.js
index eb61c30..5795e85 100644
--- a/src/r3-d3-api-shadow-a.js
+++ b/src/r3-d3-api-shadow-a.js
@@ -16,7 +16,7 @@ R3.D3.API.Shadow = function(
     radius
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(cameraIndex)) {
 
diff --git a/src/r3-d3-api-shape.js b/src/r3-d3-api-shape.js
index 74fbb54..c7b7a64 100644
--- a/src/r3-d3-api-shape.js
+++ b/src/r3-d3-api-shape.js
@@ -15,7 +15,7 @@ R3.D3.API.Shape = function(
     frictionMaterial
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(mesh)) {
         mesh = null;
diff --git a/src/r3-d3-api-skeleton.js b/src/r3-d3-api-skeleton.js
index f447023..827044e 100644
--- a/src/r3-d3-api-skeleton.js
+++ b/src/r3-d3-api-skeleton.js
@@ -21,7 +21,7 @@ R3.D3.API.Skeleton = function(
     boneTexture,
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(bones)) {
         bones = [];
diff --git a/src/r3-d3-api-solver.js b/src/r3-d3-api-solver.js
index 7cc7b46..912e36b 100644
--- a/src/r3-d3-api-solver.js
+++ b/src/r3-d3-api-solver.js
@@ -13,7 +13,7 @@ R3.D3.API.Solver = function(
 	tolerance
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
 	if (R3.Utils.UndefinedOrNull(iterations)) {
 		iterations = 10;
diff --git a/src/r3-d3-api-spline.js b/src/r3-d3-api-spline.js
index 72856ff..701f9dc 100644
--- a/src/r3-d3-api-spline.js
+++ b/src/r3-d3-api-spline.js
@@ -9,7 +9,7 @@ R3.D3.API.Spline = function(
     vertices
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(vertices)) {
         vertices = [];
diff --git a/src/r3-d3-api-text.js b/src/r3-d3-api-text.js
index 327e637..c26cb0c 100644
--- a/src/r3-d3-api-text.js
+++ b/src/r3-d3-api-text.js
@@ -15,7 +15,7 @@ R3.D3.API.Text = function(
     value
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(offset)) {
         offset = new R3.API.Vector2(0,0);
diff --git a/src/r3-d3-api-texture-canvas.js b/src/r3-d3-api-texture-canvas.js
index 7804993..146b1ff 100644
--- a/src/r3-d3-api-texture-canvas.js
+++ b/src/r3-d3-api-texture-canvas.js
@@ -9,7 +9,7 @@ R3.D3.API.Texture.Canvas = function(
     canvas
 ) {
 
-    __API_TEXTURE_MACRO__
+    __API_TEXTURE_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(canvas)) {
         canvas = new R3.API.Canvas();
diff --git a/src/r3-d3-api-texture-cube.js b/src/r3-d3-api-texture-cube.js
index 2cf6c3c..28f7429 100644
--- a/src/r3-d3-api-texture-cube.js
+++ b/src/r3-d3-api-texture-cube.js
@@ -9,7 +9,7 @@ R3.D3.API.Texture.Cube = function(
     images
 ) {
 
-    __API_TEXTURE_MACRO__
+    __API_TEXTURE_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(images)) {
         images = [
diff --git a/src/r3-d3-api-texture-image.js b/src/r3-d3-api-texture-image.js
index 3c3b330..c62183c 100644
--- a/src/r3-d3-api-texture-image.js
+++ b/src/r3-d3-api-texture-image.js
@@ -9,7 +9,7 @@ R3.D3.API.Texture.Image = function(
     image
 ) {
 
-    __API_TEXTURE_MACRO__
+    __API_TEXTURE_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(image)) {
         image = new R3.API.Image();
diff --git a/src/r3-d3-api-texture.js b/src/r3-d3-api-texture.js
index c3f06a7..8dd6eae 100644
--- a/src/r3-d3-api-texture.js
+++ b/src/r3-d3-api-texture.js
@@ -25,6 +25,8 @@
  * @param animated
  * @param reverseAnimation
  * @param forward
+ * @param depthBuffer
+ * @param stencilBuffer
  * @constructor
  */
 R3.D3.API.Texture = function(
@@ -55,7 +57,7 @@ R3.D3.API.Texture = function(
     forward
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(parentMaterials)) {
         parentMaterials = [];
diff --git a/src/r3-d3-api-viewport.js b/src/r3-d3-api-viewport.js
index 98cebb1..aae4314 100644
--- a/src/r3-d3-api-viewport.js
+++ b/src/r3-d3-api-viewport.js
@@ -20,7 +20,7 @@ R3.D3.API.Viewport = function(
     scenes
 ) {
 
-    __API_COMPONENT_MACRO__
+    __API_COMPONENT_MACRO__;
 
     if (R3.Utils.UndefinedOrNull(width)) {
         width = 1;
diff --git a/src/r3-d3-api-y-object.js b/src/r3-d3-api-y-object.js
new file mode 100644
index 0000000..11fdaf3
--- /dev/null
+++ b/src/r3-d3-api-y-object.js
@@ -0,0 +1,245 @@
+/**
+ * R3.D3.Object
+ *
+ *  - This class should not be instantiated - it is inherited by some objects to define common properties for 3D objects,
+ *    for example position, rotation, scale etc
+ *
+ * @param parent
+ * @param linkedObjects
+ * @constructor
+ */
+R3.D3.Object = function(
+    parent,
+    linkedObjects
+) {
+
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+        linkedObjects = {};
+    }
+
+    this.position = new R3.Vector3(
+        this,
+        this.position
+    );
+
+    this.quaternion = new R3.Quaternion(
+        this,
+        this.quaternion,
+    );
+
+    this.rotation = new R3.Vector3(
+        this,
+        this.rotation
+    );
+
+    this.scale = new R3.Vector3(
+        this,
+        this.scale
+    );
+
+    this.up = new R3.Vector3(
+        this,
+        this.up
+    );
+
+    this.lookAt = new R3.Vector3(
+        this,
+        this.lookAt
+    );
+
+    R3.Component.call(
+        this,
+        parent,
+        linkedObjects
+    );
+};
+
+R3.D3.Object.prototype = Object.create(R3.Component.prototype);
+R3.D3.Object.prototype.constructor = R3.D3.Object;
+
+/**
+ * Updates the mesh instance
+ */
+R3.D3.Object.prototype.updateInstance = function(property) {
+
+    if (property === 'useQuaternion') {
+        console.warn('TODO: update useQuaternion');
+        return;
+    }
+
+    if (property === 'position') {
+        console.warn('TODO: update position');
+        return;
+    }
+
+    if (property === 'quaternion') {
+        console.warn('TODO: update quaternion');
+        return;
+    }
+
+    if (property === 'rotation') {
+        console.warn('TODO: update rotation');
+        return;
+    }
+
+    if (property === 'scale') {
+        console.warn('TODO: update scale');
+        return;
+    }
+
+    if (property === 'up') {
+        console.warn('TODO: update up');
+        return;
+    }
+
+    if (property === 'lookAt') {
+        console.warn('TODO: update lookAt');
+        return;
+    }
+
+    R3.Component.prototype.updateInstance.call(this, property);
+    //
+    // if (
+    //      ||
+    //     property === '' ||
+    //     property === 'rotation'
+    // ) {
+    //     if (this.useQuaternion) {
+    //
+    //         if (R3.Utils.Defined(this.instance.quaternion)) {
+    //
+    //             this.quaternion.axis.instance.x = this.quaternion.axis.x;
+    //             this.quaternion.axis.instance.y = this.quaternion.axis.y;
+    //             this.quaternion.axis.instance.z = this.quaternion.axis.z;
+    //
+    //             this.instance.quaternion.x = this.quaternion.x;
+    //             this.instance.quaternion.y = this.quaternion.y;
+    //             this.instance.quaternion.z = this.quaternion.z;
+    //             this.instance.quaternion.w = this.quaternion.w;
+    //             this.instance.quaternion.setFromAxisAngle(
+    //                 this.quaternion.axis.instance,
+    //                 this.quaternion.angle
+    //             );
+    //
+    //             this.rotation.x = this.instance.rotation.x;
+    //             this.rotation.y = this.instance.rotation.y;
+    //             this.rotation.z = this.instance.rotation.z;
+    //
+    //             this.rotation.instance.x = this.rotation.x;
+    //             this.rotation.instance.y = this.rotation.y;
+    //             this.rotation.instance.z = this.rotation.z;
+    //         }
+    //
+    //     } else {
+    //
+    //         if (R3.Utils.Defined(this.instance.rotation)) {
+    //
+    //             this.rotation.instance.x = this.rotation.x;
+    //             this.rotation.instance.y = this.rotation.y;
+    //             this.rotation.instance.z = this.rotation.z;
+    //
+    //             this.instance.rotation.x = this.rotation.x;
+    //             this.instance.rotation.y = this.rotation.y;
+    //             this.instance.rotation.z = this.rotation.z;
+    //
+    //             this.quaternion.x = this.instance.quaternion.x;
+    //             this.quaternion.y = this.instance.quaternion.y;
+    //             this.quaternion.z = this.instance.quaternion.z;
+    //             this.quaternion.w = this.instance.quaternion.w;
+    //
+    //             this.quaternion.instance.x = this.quaternion.x;
+    //             this.quaternion.instance.y = this.quaternion.y;
+    //             this.quaternion.instance.z = this.quaternion.z;
+    //             this.quaternion.instance.w = this.quaternion.w;
+    //         }
+    //     }
+    //
+    //     // if (!this.instance.matrixAutoUpdate) {
+    //     //     this.instance.updateMatrixWorld();
+    //     //     this.instance.children.map(
+    //     //         function(child){
+    //     //             child.updateMatrixWorld();
+    //     //         }
+    //     //     )
+    //     // }
+    //
+    //     if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
+    //         this.instance.updateProjectionMatrix();
+    //     }
+    // }
+    //
+    // if (property === 'position') {
+    //
+    //     if (R3.Utils.Defined(this.instance.position)) {
+    //
+    //         this.position.instance.x = this.position.x;
+    //         this.position.instance.y = this.position.y;
+    //         this.position.instance.z = this.position.z;
+    //
+    //         this.instance.position.x = this.position.x;
+    //         this.instance.position.y = this.position.y;
+    //         this.instance.position.z = this.position.z;
+    //     }
+    //
+    //     if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
+    //         this.instance.updateProjectionMatrix();
+    //     }
+    // }
+    //
+    // if (property === 'scale') {
+    //
+    //     this.scale.instance.x = this.scale.x;
+    //     this.scale.instance.y = this.scale.y;
+    //     this.scale.instance.z = this.scale.z;
+    //
+    //     this.instance.scale.x = this.scale.x;
+    //     this.instance.scale.y = this.scale.y;
+    //     this.instance.scale.z = this.scale.z;
+    // }
+    //
+    // if (
+    //     property === 'up' ||
+    //     property === 'lookAt'
+    // ) {
+    //
+    //     this.up.instance.x = this.up.x;
+    //     this.up.instance.y = this.up.y;
+    //     this.up.instance.z = this.up.z;
+    //
+    //     this.instance.up.x = this.up.x;
+    //     this.instance.up.y = this.up.y;
+    //     this.instance.up.z = this.up.z;
+    //
+    //     this.lookAt.instance.x = this.lookAt.x;
+    //     this.lookAt.instance.y = this.lookAt.y;
+    //     this.lookAt.instance.z = this.lookAt.z;
+    //
+    //     if (R3.Utils.Defined(this.instance.lookAt)) {
+    //         this.instance.lookAt(this.lookAt.instance);
+    //     }
+    //
+    //     if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
+    //         this.instance.updateProjectionMatrix();
+    //     }
+    //
+    //     R3.D3.Object.prototype.updateFromInstance.call(this, 'rotation');
+    // }
+
+
+};
+
+/**
+ * R3.D3.Object.prototype.translate
+ *
+ *  - Translate this object in 3D space
+ *
+ * @param vector3
+ */
+R3.D3.Object.prototype.translate = function(vector3) {
+
+    this.position.x += vector3.x;
+    this.position.y += vector3.y;
+    this.position.z += vector3.z;
+
+    this.updateInstance('position');
+};
diff --git a/src/r3-d3-api-z-animation.js b/src/r3-d3-api-z-animation.js
index c1057d1..5bded54 100644
--- a/src/r3-d3-api-z-animation.js
+++ b/src/r3-d3-api-z-animation.js
@@ -1,30 +1,27 @@
 /**
- * Creates a Animation object
- * @param apiAnimation R3.D3.API.Animation
+ * R3.D3.Animation
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.D3.Animation = function(
-	apiAnimation
+    parent,
+    apiComponent
 ) {
 
-    if (R3.Utils.UndefinedOrNull(apiAnimation)) {
-        apiAnimation = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
 	R3.D3.API.Animation.call(
         this,
-        apiAnimation.id,
-        apiAnimation.name,
-        apiAnimation.rotationSpeed,
-        apiAnimation.translationSpeed,
-        apiAnimation.scaleSpeed,
-        apiAnimation.rotationFn,
-        apiAnimation.translationFn,
-        apiAnimation.scaleFn,
-        apiAnimation.blocking,
-        apiAnimation.applyToMeshWhenDone,
-        apiAnimation.meshes,
-        apiAnimation.parent
+        apiComponent,
+        apiComponent.rotationSpeed,
+        apiComponent.translationSpeed,
+        apiComponent.scaleSpeed,
+        apiComponent.rotationFn,
+        apiComponent.translationFn,
+        apiComponent.scaleFn,
+        apiComponent.blocking,
+        apiComponent.applyToMeshWhenDone
     );
 
     this.functionType = R3.D3.Animation.ANIMATION_FUNCTION_TYPE_ROTATION;
@@ -39,9 +36,7 @@ R3.D3.Animation = function(
 
     R3.Component.call(
         this,
-        {
-            'meshes' : [R3.D3.Mesh]
-        }
+        parent
     );
 };
 
@@ -162,58 +157,12 @@ R3.D3.Animation.prototype.updateInstance = function(property, item) {
         }
     }
 
-    if (property === 'meshes') {
-        // R3.Event.Emit(
-        //     R3.Event.ANIMATION_MESH_ADDED,
-        //     {
-        //         animation : this,
-        //         mesh : item
-        //     }
-        // )
-    }
-
     R3.Component.prototype.updateInstance.call(this, property);
 
 };
 
-/**
- * Converts a R3.D3.Animation to a new R3.D3.API.Animation
- * @returns {R3.D3.API.Animation}
- */
-R3.D3.Animation.prototype.toApiObject = function() {
-
-    return new R3.D3.API.Animation(
-        this.id,
-        this.name,
-        this.rotationSpeed,
-        this.translationSpeed,
-        this.scaleSpeed,
-        this.rotationFn,
-        this.translationFn,
-        this.scaleFn,
-        this.blocking,
-        this.applyToMeshWhenDone,
-        this.meshes.map(
-            function(mesh) {
-                return R3.Utils.IdOrNull(mesh);
-            }
-        ),
-        R3.Utils.IdOrNull(this.parent)
-    );
-
-};
-
 R3.D3.Animation.prototype.launchEditor = function(){
 
-    R3.Event.Emit(
-        R3.Event.GET_RUNTIME,
-        null,
-        function(runtime) {
-            this.coder = runtime.coder;
-            this.coder.isNotCodeMirrorThrow();
-        }.bind(this)
-    );
-
     var property = null;
 
     if (this.functionType === R3.D3.Animation.ANIMATION_FUNCTION_TYPE_ROTATION) {
@@ -232,6 +181,7 @@ R3.D3.Animation.prototype.launchEditor = function(){
     }
 
     if (property) {
+
         this.editor = this.coder.instance(
             document.body,
             {
@@ -249,6 +199,7 @@ R3.D3.Animation.prototype.launchEditor = function(){
             this.updateInstance();
 
         }.bind(this))
+
     } else {
         console.warn('invalid function type selected');
     }
@@ -258,33 +209,3 @@ R3.D3.Animation.prototype.closeEditor = function(){
 	var dom = this.editor.getWrapperElement();
 	dom.parentElement.removeChild(dom);
 };
-
-// R3.D3.Animation.prototype.addMesh = function(mesh) {
-//
-//     R3.Utils.PushUnique(this.meshes, mesh);
-//
-//     R3.Event.Emit(
-//         R3.Event.ANIMATION_MESH_ADDED,
-//         {
-//             animation : this,
-//             mesh : mesh
-//         }
-//     )
-//
-// };
-//
-// R3.D3.Animation.prototype.removeMesh = function(mesh) {
-//
-//     var index = this.meshes.indexOf(mesh);
-//
-//     this.meshes.splice(index, 1);
-//
-//     R3.Event.Emit(
-//         R3.Event.ANIMATION_MESH_REMOVED,
-//         {
-//             animation : this,
-//             mesh : mesh
-//         }
-//     )
-//
-// };
\ No newline at end of file
diff --git a/src/r3-d3-api-z-object.js b/src/r3-d3-api-z-object.js
deleted file mode 100644
index ebcbcd4..0000000
--- a/src/r3-d3-api-z-object.js
+++ /dev/null
@@ -1,340 +0,0 @@
-/**
- * R3.D3.Object
- * @param graphics
- * @param apiObject
- * @property objectType
- * @constructor
- */
-R3.D3.Object = function(
-    graphics,
-    apiObject
-) {
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiObject)) {
-        apiObject = {
-            objectType: R3.D3.API.Object.OBJECT_TYPE_NONE
-        };
-    }
-
-	R3.D3.API.Object.call(
-        this,
-        apiObject.id,
-        apiObject.name,
-        apiObject.objectType,
-        apiObject.parent,
-        apiObject.useQuaternion,
-        apiObject.position,
-        apiObject.quaternion,
-        apiObject.rotation,
-        apiObject.scale,
-        apiObject.up,
-        apiObject.lookAt
-    );
-
-    this.position = new R3.Vector3(
-        this.graphics,
-        this.position,
-        this
-    );
-
-    this.quaternion = new R3.Quaternion(
-        this.graphics,
-        this.quaternion,
-        this
-    );
-
-    this.rotation = new R3.Vector3(
-        this.graphics,
-        this.rotation,
-        this
-    );
-
-    this.scale = new R3.Vector3(
-        this.graphics,
-        this.scale,
-        this
-    );
-
-    this.up = new R3.Vector3(
-        this.graphics,
-        this.up,
-        this
-    );
-
-    this.lookAt = new R3.Vector3(
-        this.graphics,
-        this.lookAt,
-        this
-    );
-
-    R3.Component.call(
-        this,
-        R3.D3.Object.GetLinkedObjects(this.objectType)
-    );
-};
-
-R3.D3.Object.prototype = Object.create(R3.Component.prototype);
-R3.D3.Object.prototype.constructor = R3.D3.Object;
-
-/**
- * Get Linked Objects
- * @param objectType
- * @returns {{}}
- * @constructor
- */
-R3.D3.Object.GetLinkedObjects = function(objectType) {
-    var linkedObjects = {};
-
-    switch (objectType) {
-        case R3.D3.API.Object.OBJECT_TYPE_CAMERA_CUBE :
-            linkedObjects.renderTarget  = R3.D3.RenderTarget;
-            break;
-        case R3.D3.API.Object.OBJECT_TYPE_CAMERA_STEREO :
-            linkedObjects.effect        = R3.D3.Effect;
-            break;
-        case R3.D3.API.Object.OBJECT_TYPE_MESH :
-            linkedObjects.parentMesh    = R3.D3.Mesh;
-            linkedObjects.parentScene   = R3.D3.Scene;
-            linkedObjects.materials     = [R3.D3.Material];
-            linkedObjects.geometry      = R3.D3.Geometry;
-            linkedObjects.skeleton      = R3.D3.Skeleton;
-            break;
-        default :
-            break;
-    }
-
-    return linkedObjects;
-};
-
-/**
- * Creates a mesh instance or updates it
- */
-R3.D3.Object.prototype.createInstance = function() {
-
-    if (!this.instance) {
-        this.instance = new THREE.Object3D();
-    }
-
-    this.updateInstance('position');
-
-    if (this instanceof R3.D3.Camera) {
-
-        if (
-            this.objectType === R3.D3.API.Object.OBJECT_TYPE_CAMERA_PERSPECTIVE ||
-            this.objectType === R3.D3.API.Object.OBJECT_TYPE_CAMERA_STEREO
-        ) {
-            this.updateInstance('lookAt');
-        }
-
-    } else {
-        /**
-         * We ignore 'lookAt' - since it updates the rotation etc.. We assume that after lookAt we have our orientation
-         * and store /use these values instead - lookAt is more a 'runtime' thing
-         */
-        this.updateInstance('rotation');
-    }
-
-    this.updateInstance('scale');
-
-
-    R3.Component.prototype.createInstance.call(this);
-};
-
-/**
- * Updates the mesh instance
- */
-R3.D3.Object.prototype.updateInstance = function(property) {
-
-    if (R3.Utils.UndefinedOrNull(this.instance)) {
-        console.warn('3d object instance not ready');
-        return;
-    }
-
-    if (property === 'objectType') {
-        var componentType = R3.D3.API.Object.GetComponentType(this.objectType);
-        this.replace(componentType);
-        return;
-    }
-
-    if (
-        property === 'useQuaternion' ||
-        property === 'quaternion' ||
-        property === 'rotation'
-    ) {
-        if (this.useQuaternion) {
-
-            if (R3.Utils.Defined(this.instance.quaternion)) {
-
-                this.quaternion.axis.instance.x = this.quaternion.axis.x;
-                this.quaternion.axis.instance.y = this.quaternion.axis.y;
-                this.quaternion.axis.instance.z = this.quaternion.axis.z;
-
-                this.instance.quaternion.x = this.quaternion.x;
-                this.instance.quaternion.y = this.quaternion.y;
-                this.instance.quaternion.z = this.quaternion.z;
-                this.instance.quaternion.w = this.quaternion.w;
-                this.instance.quaternion.setFromAxisAngle(
-                    this.quaternion.axis.instance,
-                    this.quaternion.angle
-                );
-
-                this.rotation.x = this.instance.rotation.x;
-                this.rotation.y = this.instance.rotation.y;
-                this.rotation.z = this.instance.rotation.z;
-
-                this.rotation.instance.x = this.rotation.x;
-                this.rotation.instance.y = this.rotation.y;
-                this.rotation.instance.z = this.rotation.z;
-            }
-
-        } else {
-
-            if (R3.Utils.Defined(this.instance.rotation)) {
-
-                this.rotation.instance.x = this.rotation.x;
-                this.rotation.instance.y = this.rotation.y;
-                this.rotation.instance.z = this.rotation.z;
-
-                this.instance.rotation.x = this.rotation.x;
-                this.instance.rotation.y = this.rotation.y;
-                this.instance.rotation.z = this.rotation.z;
-
-                this.quaternion.x = this.instance.quaternion.x;
-                this.quaternion.y = this.instance.quaternion.y;
-                this.quaternion.z = this.instance.quaternion.z;
-                this.quaternion.w = this.instance.quaternion.w;
-
-                this.quaternion.instance.x = this.quaternion.x;
-                this.quaternion.instance.y = this.quaternion.y;
-                this.quaternion.instance.z = this.quaternion.z;
-                this.quaternion.instance.w = this.quaternion.w;
-            }
-        }
-
-        // if (!this.instance.matrixAutoUpdate) {
-        //     this.instance.updateMatrixWorld();
-        //     this.instance.children.map(
-        //         function(child){
-        //             child.updateMatrixWorld();
-        //         }
-        //     )
-        // }
-
-        if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
-            this.instance.updateProjectionMatrix();
-        }
-    }
-
-    if (property === 'position') {
-
-        if (R3.Utils.Defined(this.instance.position)) {
-
-            this.position.instance.x = this.position.x;
-            this.position.instance.y = this.position.y;
-            this.position.instance.z = this.position.z;
-
-            this.instance.position.x = this.position.x;
-            this.instance.position.y = this.position.y;
-            this.instance.position.z = this.position.z;
-        }
-
-        if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
-            this.instance.updateProjectionMatrix();
-        }
-    }
-
-    if (property === 'scale') {
-
-        this.scale.instance.x = this.scale.x;
-        this.scale.instance.y = this.scale.y;
-        this.scale.instance.z = this.scale.z;
-
-        this.instance.scale.x = this.scale.x;
-        this.instance.scale.y = this.scale.y;
-        this.instance.scale.z = this.scale.z;
-    }
-
-    if (
-        property === 'up' ||
-        property === 'lookAt'
-    ) {
-
-        this.up.instance.x = this.up.x;
-        this.up.instance.y = this.up.y;
-        this.up.instance.z = this.up.z;
-
-        this.instance.up.x = this.up.x;
-        this.instance.up.y = this.up.y;
-        this.instance.up.z = this.up.z;
-
-        this.lookAt.instance.x = this.lookAt.x;
-        this.lookAt.instance.y = this.lookAt.y;
-        this.lookAt.instance.z = this.lookAt.z;
-
-        if (R3.Utils.Defined(this.instance.lookAt)) {
-            this.instance.lookAt(this.lookAt.instance);
-        }
-
-        if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
-            this.instance.updateProjectionMatrix();
-        }
-
-        R3.D3.Object.prototype.updateFromInstance.call(this, 'rotation');
-    }
-
-    R3.Component.prototype.updateInstance.call(this, property);
-};
-
-/**
- * Update R3.D3.Object from its instance
- * @param property
- */
-R3.D3.Object.prototype.updateFromInstance = function(property) {
-    if (
-        property === 'rotation' ||
-        property === 'quaternion'
-    ) {
-        this.rotation.x = this.instance.rotation.x;
-        this.rotation.y = this.instance.rotation.y;
-        this.rotation.z = this.instance.rotation.z;
-
-        this.quaternion.x = this.instance.quaternion.x;
-        this.quaternion.y = this.instance.quaternion.y;
-        this.quaternion.z = this.instance.quaternion.z;
-        this.quaternion.w = this.instance.quaternion.w;
-    }
-};
-
-/**
- * Converts a R3.D3.Object to a R3.D3.API.Object
- * @returns {R3.D3.API.Object}
- */
-R3.D3.Object.prototype.toApiObject = function() {
-
-    var apiObject = new R3.D3.API.Object(
-        this.id,
-        this.name,
-        this.objectType,
-        R3.Utils.IdOrNull(this.parent),
-        this.useQuaternion,
-        this.position.toApiObject(),
-        this.quaternion.toApiObject(),
-        this.rotation.toApiObject(),
-        this.scale.toApiObject(),
-        this.up.toApiObject(),
-        this.lookAt.toApiObject()
-    );
-
-    return apiObject;
-};
-
-R3.D3.Object.prototype.translate = function(vector3) {
-
-    this.position.x += vector3.x;
-    this.position.y += vector3.y;
-    this.position.z += vector3.z;
-
-    this.updateInstance('position');
-};
diff --git a/src/r3-d3-audio.js b/src/r3-d3-audio.js
index b10d0cd..f0d79c2 100644
--- a/src/r3-d3-audio.js
+++ b/src/r3-d3-audio.js
@@ -1,39 +1,29 @@
 /**
- * Creates a Audio object
- * @param graphics R3.GraphicsRuntime
- * @param apiAudio R3.D3.API.Audio
+ * R3.D3.Audio
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.D3.Audio = function(
-    graphics,
-    apiAudio
+    parent,
+    apiComponent
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiAudio)) {
-        apiAudio = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.D3.API.Audio.call(
         this,
-        apiAudio.id,
-        apiAudio.name,
-        apiAudio.path,
-        apiAudio.loop,
-        apiAudio.volume,
-        apiAudio.camera,
-        apiAudio.overplay,
-        apiAudio.pause,
-        apiAudio.parent
+        apiComponent,
+        apiComponent.path,
+        apiComponent.loop,
+        apiComponent.volume,
+        apiComponent.cameraIndex,
+        apiComponent.paused
     );
 
     R3.Component.call(
         this,
-        {
-            'camera' : R3.D3.Camera
-        }
+        parent
     );
 
 };
@@ -46,55 +36,27 @@ R3.D3.Audio.prototype.constructor = R3.D3.Audio;
  */
 R3.D3.Audio.prototype.createInstance = function() {
 
-    if (R3.Utils.UndefinedOrNull(this.camera) ||
-        R3.Utils.UndefinedOrNull(this.camera.instance)) {
-        console.log('audio not ready to create instance');
-        return;
-    }
-
-
-    R3.Event.Emit(
-        R3.Event.GET_API_URL,
-        null,
-        function(data) {
-            this.apiUrl = data.apiUrl;
-        }.bind(this)
+    this.instance = this.graphics.Audio(
+        this,
+        this.path,
+        this.loop,
+        this.volume,
+        this.cameraIndex,
+        this.paused
     );
 
-    //Create an AudioListener and add it to the camera
-    var listener = new THREE.AudioListener();
-
-    this.camera.instance.add( listener );
-
-    // create a global audio source
-    this.instance = new THREE.Audio( listener );
-
-    var audioLoader = new THREE.AudioLoader();
-
-    console.log('loading audio : ' + this.name);
-
-    if (document.documentMode || /Edge/.test(navigator.userAgent)) {
-        R3.Component.prototype.createInstance.call(this);
-    } else {
-        try {
-            audioLoader.load(
-                this.apiUrl + this.path + '?ts=' + Date.now(),
-                function(buffer) {
-
-                    console.log('loaded audio: ' + this.name);
-
-                    this.instance.setBuffer(buffer);
-                    this.instance.setLoop(this.loop);
-                    this.instance.setVolume(this.volume);
-                    R3.Component.prototype.createInstance.call(this);
-                }.bind(this)
-            );
-        } catch (error) {
-            console.warn('failed to load audio - does it exist? : ' + error.message || 'unknown reason');
-            R3.Component.prototype.createInstance.call(this);
-        }
+    if (this.instance === true) {
+        /**
+         * We are disabling this audio for some reason - stop using M$ !
+         */
+        R3.Component.prototype.createInstance.call(component);
     }
 
+    /**
+     * Don't worry about calling R3.Component.prototype.createInstance - this happens asynchronously once the audio
+     * loaded
+     */
+
 };
 
 /**
@@ -102,6 +64,10 @@ R3.D3.Audio.prototype.createInstance = function() {
  */
 R3.D3.Audio.prototype.updateInstance = function(property) {
 
+    if (this.instance === true) {
+        return;
+    }
+
     if (property === 'loop') {
         this.instance.setLoop(this.loop);
     }
@@ -121,45 +87,20 @@ R3.D3.Audio.prototype.updateInstance = function(property) {
     R3.Component.prototype.updateInstance.call(this, property);
 };
 
-/**
- * Converts a R3.D3.Audio to a new R3.D3.API.Audio
- * @returns {R3.D3.API.Audio}
- */
-R3.D3.Audio.prototype.toApiObject = function() {
-
-    return new R3.D3.API.Audio(
-        this.id,
-        this.name,
-        this.path,
-        this.loop,
-        this.volume,
-        R3.Utils.IdOrNull(this.camera),
-        this.overplay,
-        this.paused,
-        R3.Utils.IdOrNull(this.parent)
-    );
-
-};
-
-/**
- * Converts from an Object Audio to a R3.D3.Audio
- * @param graphics R3.GraphicsRuntime
- * @param objectAudio Object
- * @returns {R3.D3.Audio}
- * @constructor
- */
-R3.D3.Audio.FromObject = function(graphics, objectAudio) {
-
-    var apiAudio = R3.D3.API.Audio.FromObject(objectAudio);
-
-    return new R3.D3.Audio(
-        graphics,
-        apiAudio
-    );
-
-};
-
-
 R3.D3.Audio.prototype.play = function() {
+
+    if (this.instance === true) {
+        return;
+    }
+
     this.instance.play();
-};
\ No newline at end of file
+};
+
+R3.D3.Audio.prototype.pause = function() {
+
+    if (this.instance === true) {
+        return;
+    }
+
+    this.instance.pause();
+};
diff --git a/src/r3-d3-bone-weight.js b/src/r3-d3-bone-weight.js
index e7b6330..a94b5c0 100644
--- a/src/r3-d3-bone-weight.js
+++ b/src/r3-d3-bone-weight.js
@@ -1,24 +1,26 @@
 /**
- * BoneWeight Superset
+ * R3.D3.BoneWeight
+ * @param parent
+ * @param apiComponent
  * @constructor
- * @param graphics R3.GraphicsRuntime
- * @param apiBoneWeight R3.D3.API.BoneWeight
  */
 R3.D3.BoneWeight = function(
-    graphics,
-    apiBoneWeight
+    parent,
+    apiComponent
 ) {
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
 
-    if (R3.Utils.UndefinedOrNull(apiBoneWeight)) {
-        apiBoneWeight = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
 	R3.D3.API.BoneWeight.call(
         this,
-        apiBoneWeight.boneIndex,
-        apiBoneWeight.weight
+        apiComponent,
+        apiComponent.boneIndex,
+        apiComponent.weight
+    );
+
+    R3.Component.call(
+        this,
+        parent
     );
 };
 
@@ -26,15 +28,33 @@ R3.D3.BoneWeight.prototype = Object.create(R3.Component.prototype);
 R3.D3.BoneWeight.prototype.constructor = R3.D3.BoneWeight;
 
 /**
- * Converts a R3.D3.BoneWeight to R3.D3.API.BoneWeight
- * @returns {R3.D3.API.BoneWeight}
+ * R3.D3.BoneWeight.prototype.createInstance
  */
-R3.D3.BoneWeight.prototype.toApiObject = function() {
+R3.D3.BoneWeight.prototype.createInstance = function() {
 
-    var apiBoneWeight = new R3.D3.API.BoneWeight(
-        this.boneIndex,
-        this.weight
-    );
+    this.instance = true;
+
+    R3.Component.prototype.createInstance.call(this);
+
+};
+
+/**
+ * R3.D3.BoneWeight.prototype.updateInstance
+ * @param property
+ */
+R3.D3.BoneWeight.prototype.updateInstance = function(property) {
+
+    if (property === 'boneIndex') {
+        throw new Error('TODO: update boneIndex');
+    }
+
+    if (property === 'weight') {
+        throw new Error('TODO: update weight');
+    }
+
+    R3.Component.prototype.updateInstance.call(
+        this,
+        property
+    )
 
-    return apiBoneWeight;
 };
diff --git a/src/r3-d3-bone.js b/src/r3-d3-bone.js
index 4c37414..c906708 100644
--- a/src/r3-d3-bone.js
+++ b/src/r3-d3-bone.js
@@ -1,33 +1,26 @@
 /**
  * R3.D3.Bone
+ * @param parent
+ * @param apiComponent
  * @constructor
- * @param graphics R3.GraphicsRuntime
- * @param apiD3ObjectBone
  */
 R3.D3.Bone = function(
-    graphics,
-    apiD3ObjectBone
+    parent,
+    apiComponent
 ) {
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
 
-    if (R3.Utils.UndefinedOrNull(apiD3ObjectBone)) {
-        apiD3ObjectBone = {
-            objectType: R3.D3.API.Object.OBJECT_TYPE_BONE
-        };
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.D3.API.Bone.call(
         this,
-        apiD3ObjectBone,
-        apiD3ObjectBone.childBoneIds,
-        apiD3ObjectBone.parentBoneIds
+        apiComponent,
+        apiComponent.childBoneIds,
+        apiComponent.parentBoneIds
     );
 
     R3.D3.Object.call(
         this,
-        this.graphics,
-        this
+        parent
     );
 };
 
@@ -40,7 +33,7 @@ R3.D3.Bone.prototype.constructor = R3.D3.Bone;
  */
 R3.D3.Bone.prototype.createInstance = function() {
 
-    this.instance = new THREE.Bone();
+    this.instance = this.graphics.Bone();
 
     R3.D3.Object.prototype.createInstance.call(this);
 };
@@ -50,15 +43,6 @@ R3.D3.Bone.prototype.createInstance = function() {
  */
 R3.D3.Bone.prototype.updateInstance = function(property) {
 
-    if (!this.instance) {
-        console.warn('bone instance not ready');
-    }
-
-    if (property === 'name') {
-        this.instance.name = this.name;
-        return;
-    }
-
     if (property === 'childBoneIds') {
         console.warn('todo: child bone ids update');
         return;
@@ -71,20 +55,3 @@ R3.D3.Bone.prototype.updateInstance = function(property) {
 
     R3.D3.Object.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Converts a R3.D3.Bone to R3.D3.API.Bone
- * @returns {R3.D3.API.Bone}
- */
-R3.D3.Bone.prototype.toApiObject = function() {
-
-    var apiD3Object = R3.D3.Object.prototype.toApiObject.call(this);
-
-    var apiBone = new R3.D3.API.Bone(
-        apiD3Object,
-        this.childBoneIds,
-        this.parentBoneIds
-    );
-
-    return apiBone;
-};
\ No newline at end of file
diff --git a/src/r3-d3-broadphase.js b/src/r3-d3-broadphase.js
index 02a7d2e..b2aa271 100644
--- a/src/r3-d3-broadphase.js
+++ b/src/r3-d3-broadphase.js
@@ -1,30 +1,27 @@
 /**
- * Broadphase Runtime
- * @param physics R3.GraphicsRuntime
- * @param apiBroadphase R3.D3.API.Broadphase
+ * R3.D3.Broadphase
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.D3.Broadphase = function(
-    physics,
-    apiBroadphase
+    parent,
+    apiComponent
 ) {
 
-    this.physics = physics;
-    this.physics.isNotCannonThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiBroadphase)) {
-        apiBroadphase = {};
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.D3.API.Broadphase.call(
         this,
-        apiBroadphase.id,
-        apiBroadphase.name,
-        apiBroadphase.broadphaseType,
-        apiBroadphase.parent
+        apiComponent,
+        apiComponent.broadphaseType
+    );
+
+    R3.Component.call(
+        this,
+        parent
     );
 
-    R3.Component.call(this);
 };
 
 R3.D3.Broadphase.prototype = Object.create(R3.Component.prototype);
@@ -39,80 +36,24 @@ R3.D3.Broadphase.BROADPHASE_TYPE_GRID  = 0x2;
 R3.D3.Broadphase.BROADPHASE_TYPE_SAP   = 0x3;
 
 /**
- *
- * @returns {*}
+ * R3.D3.Broadphase.prototype.createInstance
  */
 R3.D3.Broadphase.prototype.createInstance = function() {
 
-    if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_NAIVE) {
-        this.instance = new CANNON.NaiveBroadphase();
-    } else if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_GRID) {
-        this.instance = new CANNON.GridBroadphase();
-    } else if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_SAP) {
-        this.instance = new CANNON.SAPBroadphase();
-    } else {
-        console.warn('Unsupported broadphase type: ' + this.broadphaseType);
-        throw new Error('Unsupported broadphase type: ' + this.broadphaseType);
-    }
+    this.instance = this.physics.Broadphase(this.broadphaseType);
 
     R3.Component.prototype.createInstance.call(this);
 };
 
 /**
- *
+ * R3.D3.Broadphase.prototype.updateInstance
  */
 R3.D3.Broadphase.prototype.updateInstance = function(property) {
 
-    if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_NAIVE) {
-        if (!(this.instance instanceof CANNON.NaiveBroadphase)) {
-            this.createInstance();
-        }
+    if (property === 'broadphaseType') {
+        this.instance = this.physics.Broadphase(this.broadphaseType);
+        return;
     }
 
-	if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_GRID) {
-		if (!(this.instance instanceof CANNON.GridBroadphase)) {
-            this.createInstance();
-		}
-	}
-
-	if (this.broadphaseType === R3.D3.Broadphase.BROADPHASE_TYPE_SAP) {
-		if (!(this.instance instanceof CANNON.SAPBroadphase)) {
-            this.createInstance();
-		}
-	}
-
     R3.Component.prototype.updateInstance.call(this, property);
 };
-
-/**
- * R3.D3.Broadphase to R3.D3.API.Broadphase
- * @returns {R3.D3.API.Broadphase}
- */
-R3.D3.Broadphase.prototype.toApiObject = function() {
-
-    var apiBroadphase = new R3.D3.API.Broadphase(
-        this.id,
-        this.name,
-        this.broadphaseType,
-        R3.Utils.IdOrNull(this.parent)
-    );
-
-    return apiBroadphase;
-};
-
-/**
- * R3.D3.Broadphase from Object Broadphase
- * @param graphics
- * @param objectComponent
- * @returns {R3.D3.Broadphase}
- * @constructor
- */
-R3.D3.Broadphase.FromObject = function(graphics, objectComponent) {
-
-    var apiBroadphase = R3.D3.API.Broadphase.FromObject(objectComponent);
-
-    return new R3.D3.Broadphase(
-        graphics,
-        apiBroadphase
-    );
-};
\ No newline at end of file
diff --git a/src/r3-d3-camera-a.js b/src/r3-d3-camera-a.js
index 3999581..836bb4e 100644
--- a/src/r3-d3-camera-a.js
+++ b/src/r3-d3-camera-a.js
@@ -1,110 +1,43 @@
 /**
  * R3.D3.Camera
- * @param graphics R3.GraphicsRuntime
- * @param apiD3ObjectCamera GR3.D3.API.Object
+ *
+ *  - This class cannot be instantiated - simply pass it all through to R3.D3.Object
+ *
+ * @param parent
+ * @param linkedObjects
  * @constructor
  */
 R3.D3.Camera = function(
-    graphics,
-    apiD3ObjectCamera
+    parent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiD3ObjectCamera)) {
-        apiD3ObjectCamera = {
-            objectType : R3.D3.API.Object.OBJECT_TYPE_CAMERA
-        };
-    }
-
-    R3.D3.API.Camera.call(
-        this,
-        apiD3ObjectCamera,
-        apiD3ObjectCamera.aspect
-    );
-
     R3.D3.Object.call(
         this,
-        this.graphics,
-        this
+        parent,
+        linkedObjects
     );
+
 };
 
 R3.D3.Camera.prototype = Object.create(R3.D3.Object.prototype);
 R3.D3.Camera.prototype.constructor = R3.D3.Camera;
 
-/**
- * Creates a camera instance of 'graphics' type (only THREE for now)
- * @returns {THREE.Camera}
- */
-R3.D3.Camera.prototype.createInstance = function() {
-
-    /**
-     * Not all implementations of camera has aspect ratio, we, however do have an aspect ratio for all our cameras
-     */
-    if (R3.Utils.Defined(this.instance.aspect)) {
-
-        var size = R3.Utils.GetWindowSize();
-
-        this.aspect = size.width / size.height;
-
-        this.instance.aspect = this.aspect;
-    }
-
-    R3.D3.Object.prototype.createInstance.call(this);
-};
-
 /**
  * Updates the instance with the current state
  */
 R3.D3.Camera.prototype.updateInstance = function(property) {
 
     if (property === 'aspect') {
-        if (R3.Utils.Defined(this.instance.aspect)) {
-            this.instance.aspect = this.aspect;
-            if (R3.Utils.Defined(this.instance.updateProjectionMatrix)) {
-                this.instance.updateProjectionMatrix();
-            }
-        } else {
-            console.warn('updating the aspect ratio of this type of camera has no effect.');
+
+        this.instance.aspect = this.aspect;
+
+        if (typeof this.instance.updateProjectionMatrix === 'function') {
+            this.instance.updateProjectionMatrix();
         }
+
         return;
     }
 
     R3.D3.Object.prototype.updateInstance.call(this, property);
 };
-
-/**
- * Update R3.D3.Camera from instance
- */
-R3.D3.Camera.prototype.updateFromInstance = function() {
-
-    this.aspect = this.instance.aspect;
-
-    this.position.x = this.instance.position.x;
-    this.position.y = this.instance.position.y;
-    this.position.z = this.instance.position.z;
-
-    if (this.instance.target) {
-        this.lookAt.x = this.instance.target.position.x;
-        this.lookAt.y = this.instance.target.position.y;
-        this.lookAt.z = this.instance.target.position.z;
-    } else {
-        console.warn('todo: update lookAt somehow...');
-    }
-};
-
-/**
- * Converts a R3.D3.Camera to a new R3.D3.API.Camera
- * @returns {R3.D3.API.Camera}
- */
-R3.D3.Camera.prototype.toApiObject = function() {
-
-    var apiD3Object = R3.D3.Object.prototype.toApiObject.call(this);
-
-    return new R3.D3.API.Camera(
-        apiD3Object,
-        this.aspect
-    );
-};
diff --git a/src/r3-d3-camera-cube.js b/src/r3-d3-camera-cube.js
index dc93ea0..22ef5e4 100644
--- a/src/r3-d3-camera-cube.js
+++ b/src/r3-d3-camera-cube.js
@@ -1,43 +1,37 @@
 /**
  * R3.D3.Camera.Cube
- * @param graphics R3.GraphicsRuntime
- * @param apiD3ObjectCubeCamera
+ * @param parent
+ * @param apiComponent
  * @constructor
  */
 R3.D3.Camera.Cube = function(
-	graphics,
-	apiD3ObjectCubeCamera
+	parent,
+	apiComponent
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
-
-    if (R3.Utils.UndefinedOrNull(apiD3ObjectCubeCamera)) {
-        apiD3ObjectCubeCamera = {
-            objectType : R3.D3.API.Object.OBJECT_TYPE_CAMERA_CUBE
-        };
-    }
+    __RUNTIME_COMPONENT_MACRO__;
 
     R3.D3.API.Camera.Cube.call(
         this,
-        apiD3ObjectCubeCamera,
-        apiD3ObjectCubeCamera.near,
-        apiD3ObjectCubeCamera.far,
-        apiD3ObjectCubeCamera.cubeResolution,
-        apiD3ObjectCubeCamera.renderTarget
+        apiComponent,
+        apiComponent.near,
+        apiComponent.far,
+        apiComponent.cubeResolution,
+        apiComponent.renderTarget
     );
 
-    if (this.renderTarget instanceof R3.D3.API.RenderTarget.Cube) {
-        this.renderTarget = new R3.D3.RenderTarget.Cube(
-            this.graphics,
-            this.renderTarget
-        )
+    if (this.renderTarget instanceof R3.API.Component) {
+        this.renderTarget = R3.Component.ConstructFromObject(this.renderTarget);
     }
 
+    var linkedObjects = {
+        renderTarget : R3.D3.RenderTarget.Cube
+    };
+
     R3.D3.Camera.call(
         this,
-        this.graphics,
-        this
+        parent,
+        linkedObjects
     );
     
 };
@@ -51,41 +45,31 @@ R3.D3.Camera.Cube.prototype.constructor = R3.D3.Camera.Cube;
  */
 R3.D3.Camera.Cube.prototype.createInstance = function() {
 
-    this.instance = new THREE.CubeCamera(
+    this.instance = this.graphics.CubeCamera(
         this.near,
         this.far,
         this.cubeResolution
     );
 
-    /**
-     * We have the same situation here - if we have no render target, this camera was constructed dynamically,
-     * otherwise, it was loaded from the API
-     */
+    this.renderTarget.instance = this.instance.renderTarget;
 
-    if (R3.Utils.UndefinedOrNull(this.renderTarget)) {
+    this.renderTarget.updateFromInstance('width');
+    this.renderTarget.updateFromInstance('height');
+    this.renderTarget.updateFromInstance('scissor');
+    this.renderTarget.updateFromInstance('scissorTest');
+    this.renderTarget.updateFromInstance('viewport');
+    this.renderTarget.updateFromInstance('depthBuffer');
+    this.renderTarget.updateFromInstance('depthTexture');
+    this.renderTarget.updateFromInstance('stencilBuffer');
 
-        /**
-         * We construct a new target, assign it the instance from the cube camera, and update ourselves from the instance
-         * @type {R3.D3.RenderTarget.Cube}
-         */
-        this.renderTarget = new R3.D3.RenderTarget.Cube(this.graphics);
-        this.renderTarget.instance = this.instance.renderTarget;
-
-        this.renderTarget.updateFromInstance();
-
-    } else {
-
-        /**
-         * We have a render target loaded from the API
-         */
-        this.renderTarget.instance = this.instance.renderTarget;
-        this.renderTarget.applyToInstance();
-    }
-
-    this.renderTarget.instance.setSize(
-        this.cubeResolution,
-        this.cubeResolution
-    );
+    this.renderTarget.texture.updateFromInstance('wrapS');
+    this.renderTarget.texture.updateFromInstance('wrapT');
+    this.renderTarget.texture.updateFromInstance('magFilter');
+    this.renderTarget.texture.updateFromInstance('minFilter');
+    this.renderTarget.texture.updateFromInstance('format');
+    this.renderTarget.texture.updateFromInstance('type');
+    this.renderTarget.texture.updateFromInstance('anisotropy');
+    this.renderTarget.texture.updateFromInstance('encoding');
 
     R3.D3.Camera.prototype.createInstance.call(this);
 };
@@ -95,11 +79,6 @@ R3.D3.Camera.Cube.prototype.createInstance = function() {
  */
 R3.D3.Camera.Cube.prototype.updateInstance = function(property) {
 
-    if (property === 'fov') {
-        console.warn('changing the fov of a cube camera has no effect - its always 90');
-        return;
-    }
-
     if (property === 'near') {
         this.instance.near = this.near;
         return;
@@ -119,13 +98,7 @@ R3.D3.Camera.Cube.prototype.updateInstance = function(property) {
     }
 
     if (property === 'renderTarget') {
-
-        console.warn('experimental render target change for cube camera');
-
-        if (this.renderTarget && this.renderTarget.instance) {
-            this.instance.renderTarget = this.renderTarget.instance;
-        }
-
+        console.warn('TODO: renderTarget update');
         return;
     }
         
@@ -143,40 +116,3 @@ R3.D3.Camera.Cube.prototype.update = function(renderer, scene) {
         scene.instance
     )
 };
-
-/**
- * Converts a R3.D3.Camera to a R3.D3.API.Camera
- * @returns {R3.D3.API.Camera}
- */
-R3.D3.Camera.Cube.prototype.toApiObject = function() {
-
-    var apiCamera = R3.D3.Camera.prototype.toApiObject.call(this);
-
-    var apiCubeCamera = new R3.D3.API.Camera.Cube(
-        apiCamera,
-        this.near,
-        this.far,
-        this.cubeResolution,
-        R3.Utils.IdOrNull(this.renderTarget)
-    );
-
-    return apiCubeCamera;
-};
-
-/**
- * Updates R3.D3.Camera.Cube from instance
- */
-R3.D3.Camera.Cube.prototype.updateFromInstance = function() {
-
-    this.near                   = this.instance.near;
-    this.far                    = this.instance.far;
-    this.cubeResolution         = this.instance.cubeResolution;
-
-    this.renderTarget.instance  = this.instance.renderTarget;
-
-    if (this.renderTarget.instance) {
-        this.renderTarget.updateFromInstance();
-    }
-
-    R3.D3.Camera.prototype.updateFromInstance.call(this);
-};
\ No newline at end of file
diff --git a/src/r3-d3-camera-orthographic-fixed-aspect.js b/src/r3-d3-camera-orthographic-fixed-aspect.js
index f4a1eeb..3ba3c1b 100644
--- a/src/r3-d3-camera-orthographic-fixed-aspect.js
+++ b/src/r3-d3-camera-orthographic-fixed-aspect.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Camera.Orthographic
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3OBjectOrthographicCamera
  * @constructor
  */
diff --git a/src/r3-d3-camera-orthographic-zoomed-aspect.js b/src/r3-d3-camera-orthographic-zoomed-aspect.js
index f4a1eeb..3ba3c1b 100644
--- a/src/r3-d3-camera-orthographic-zoomed-aspect.js
+++ b/src/r3-d3-camera-orthographic-zoomed-aspect.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Camera.Orthographic
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3OBjectOrthographicCamera
  * @constructor
  */
diff --git a/src/r3-d3-camera-orthographic.js b/src/r3-d3-camera-orthographic.js
index b40c663..aa0ddd1 100644
--- a/src/r3-d3-camera-orthographic.js
+++ b/src/r3-d3-camera-orthographic.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Camera.Orthographic
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3OBjectOrthographicCamera
  * @constructor
  */
diff --git a/src/r3-d3-camera-perspective-stereo.js b/src/r3-d3-camera-perspective-stereo.js
index b7e8c49..ed22ec1 100644
--- a/src/r3-d3-camera-perspective-stereo.js
+++ b/src/r3-d3-camera-perspective-stereo.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Camera.Perspective.Stereo
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3ObjectPerspectiveStereoCamera
  * @constructor
  */
@@ -17,7 +17,7 @@ R3.D3.Camera.Perspective.Stereo = function(
             objectType : R3.D3.API.Object.OBJECT_TYPE_CAMERA_PERSPECTIVE_STEREO
         };
     }
-
+    linkedObjects.effect        = R3.D3.Effect;
     R3.D3.API.Camera.Perspective.Stereo.call(
         this,
         apiD3ObjectPerspectiveStereoCamera,
diff --git a/src/r3-d3-camera-perspective.js b/src/r3-d3-camera-perspective.js
index 7835335..06cfe76 100644
--- a/src/r3-d3-camera-perspective.js
+++ b/src/r3-d3-camera-perspective.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Camera.Perspective
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3ObjectPerspectiveCamera
  * @constructor
  */
diff --git a/src/r3-d3-composer.js b/src/r3-d3-composer.js
index 8a9a517..9eee17b 100644
--- a/src/r3-d3-composer.js
+++ b/src/r3-d3-composer.js
@@ -1,6 +1,6 @@
 /**
  * Renders a scene with a camera
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiComposer R3.D3.API.Composer
  * @constructor
  */
diff --git a/src/r3-d3-effect-a.js b/src/r3-d3-effect-a.js
index 2750549..becbec0 100644
--- a/src/r3-d3-effect-a.js
+++ b/src/r3-d3-effect-a.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Effect
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiEffect R3.D3.API.Effect
  * @constructor
  */
diff --git a/src/r3-d3-effect-anaglyph.js b/src/r3-d3-effect-anaglyph.js
index 03571de..261d415 100644
--- a/src/r3-d3-effect-anaglyph.js
+++ b/src/r3-d3-effect-anaglyph.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Effect.Anaglyph
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiAnaglyphEffect
  * @constructor
  */
diff --git a/src/r3-d3-effect-parallax.js b/src/r3-d3-effect-parallax.js
index 7b1b366..e47a224 100644
--- a/src/r3-d3-effect-parallax.js
+++ b/src/r3-d3-effect-parallax.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Effect.Parallax
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiParallaxEffect
  * @constructor
  */
diff --git a/src/r3-d3-effect-stereo.js b/src/r3-d3-effect-stereo.js
index 5690b7c..1eb6423 100644
--- a/src/r3-d3-effect-stereo.js
+++ b/src/r3-d3-effect-stereo.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Effect.Stereo
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiStereoEffect
  * @constructor
  */
diff --git a/src/r3-d3-face.js b/src/r3-d3-face.js
index ad682dc..30feef4 100644
--- a/src/r3-d3-face.js
+++ b/src/r3-d3-face.js
@@ -10,9 +10,9 @@ R3.D3.Face = function(
 ) {
 
     this.implementation = implementation;
-    if (implementation instanceof R3.GraphicsRuntime) {
+    if (implementation instanceof R3.Runtime.Graphics) {
         this.implementation.isNotThreeThrow();
-    } else if (implementation instanceof R3.PhysicsRuntime) {
+    } else if (implementation instanceof R3.Runtime.Physics) {
         this.implementation.isNotCannonThrow();
     } else {
         throw new Error('Unhandled implementation : ' + implementation);
@@ -40,7 +40,7 @@ R3.D3.Face = function(
         apiFace.parent
 	);
 
-    if (this.implementation instanceof R3.GraphicsRuntime) {
+    if (this.implementation instanceof R3.Runtime.Graphics) {
         /**
          * physics faces have no color... a little sad right?
          */
diff --git a/src/r3-d3-font.js b/src/r3-d3-font.js
index 403e3e8..a99523f 100644
--- a/src/r3-d3-font.js
+++ b/src/r3-d3-font.js
@@ -1,6 +1,6 @@
 /**
  * Font Superset - The apiFont properties get moved into the Font object itself, and then the instance is created
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiFont R3.D3.API.Font
  * @constructor
  */
@@ -83,7 +83,7 @@ R3.D3.Font.prototype.toApiObject = function() {
 
 /**
  * Returns a new R3.D3.Font from a R3.D3.API.Font
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param objectFont R3.D3.API.Font
  * @returns {R3.D3.Font}
  */
diff --git a/src/r3-d3-friction-contact-material.js b/src/r3-d3-friction-contact-material.js
index 0247b01..fdf4fc5 100644
--- a/src/r3-d3-friction-contact-material.js
+++ b/src/r3-d3-friction-contact-material.js
@@ -1,6 +1,6 @@
 /**
  * FrictionContactMaterial Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiFrictionContactMaterial R3.D3.API.FrictionContactMaterial
  * @constructor
  */
diff --git a/src/r3-d3-friction-material.js b/src/r3-d3-friction-material.js
index 0e7b3e1..5e03ef2 100644
--- a/src/r3-d3-friction-material.js
+++ b/src/r3-d3-friction-material.js
@@ -1,6 +1,6 @@
 /**
  * FrictionMaterial Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiFrictionMaterial R3.D3.API.FrictionMaterial
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-box.js b/src/r3-d3-geometry-buffer-box.js
index 9998b58..5920e29 100644
--- a/src/r3-d3-geometry-buffer-box.js
+++ b/src/r3-d3-geometry-buffer-box.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Box
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferBox
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-circle.js b/src/r3-d3-geometry-buffer-circle.js
index 070c0c1..9c97ded 100644
--- a/src/r3-d3-geometry-buffer-circle.js
+++ b/src/r3-d3-geometry-buffer-circle.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Circle
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferCircle
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-cone.js b/src/r3-d3-geometry-buffer-cone.js
index a216a67..bc11074 100644
--- a/src/r3-d3-geometry-buffer-cone.js
+++ b/src/r3-d3-geometry-buffer-cone.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Cone
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferCone
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-cylinder.js b/src/r3-d3-geometry-buffer-cylinder.js
index 0b6d42b..d2d42ef 100644
--- a/src/r3-d3-geometry-buffer-cylinder.js
+++ b/src/r3-d3-geometry-buffer-cylinder.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Cylinder
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferCylinder
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-dodecahedron.js b/src/r3-d3-geometry-buffer-dodecahedron.js
index 14bcb1b..d2b2950 100644
--- a/src/r3-d3-geometry-buffer-dodecahedron.js
+++ b/src/r3-d3-geometry-buffer-dodecahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Dodecahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferDodecahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-extrude.js b/src/r3-d3-geometry-buffer-extrude.js
index 82dcd61..b17bcb2 100644
--- a/src/r3-d3-geometry-buffer-extrude.js
+++ b/src/r3-d3-geometry-buffer-extrude.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Extrude
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferExtrude
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-icosahedron.js b/src/r3-d3-geometry-buffer-icosahedron.js
index 593b980..6a9cd15 100644
--- a/src/r3-d3-geometry-buffer-icosahedron.js
+++ b/src/r3-d3-geometry-buffer-icosahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Icosahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferIcosahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-instanced.js b/src/r3-d3-geometry-buffer-instanced.js
index 630243f..ad4d04a 100644
--- a/src/r3-d3-geometry-buffer-instanced.js
+++ b/src/r3-d3-geometry-buffer-instanced.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Instanced
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferInstanced
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-lathe.js b/src/r3-d3-geometry-buffer-lathe.js
index e06f30c..e832bc1 100644
--- a/src/r3-d3-geometry-buffer-lathe.js
+++ b/src/r3-d3-geometry-buffer-lathe.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Lathe
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferLathe
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-octahedron.js b/src/r3-d3-geometry-buffer-octahedron.js
index b051347..4030c07 100644
--- a/src/r3-d3-geometry-buffer-octahedron.js
+++ b/src/r3-d3-geometry-buffer-octahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Octahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferOctahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-parametric.js b/src/r3-d3-geometry-buffer-parametric.js
index fbbe45a..1d82c5b 100644
--- a/src/r3-d3-geometry-buffer-parametric.js
+++ b/src/r3-d3-geometry-buffer-parametric.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Parametric
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferParametric
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-plane.js b/src/r3-d3-geometry-buffer-plane.js
index a8efcfc..3c60910 100644
--- a/src/r3-d3-geometry-buffer-plane.js
+++ b/src/r3-d3-geometry-buffer-plane.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Plane
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferPlane
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-polyhedron.js b/src/r3-d3-geometry-buffer-polyhedron.js
index ccb2fa4..50b9b7e 100644
--- a/src/r3-d3-geometry-buffer-polyhedron.js
+++ b/src/r3-d3-geometry-buffer-polyhedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Polyhedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferPolyhedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-ring.js b/src/r3-d3-geometry-buffer-ring.js
index bea537c..5a92ed7 100644
--- a/src/r3-d3-geometry-buffer-ring.js
+++ b/src/r3-d3-geometry-buffer-ring.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Ring
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferRing
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-shape.js b/src/r3-d3-geometry-buffer-shape.js
index 7ea8295..f0ac1fe 100644
--- a/src/r3-d3-geometry-buffer-shape.js
+++ b/src/r3-d3-geometry-buffer-shape.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Shape
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferShape
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-sphere.js b/src/r3-d3-geometry-buffer-sphere.js
index 052d9a0..c737c37 100644
--- a/src/r3-d3-geometry-buffer-sphere.js
+++ b/src/r3-d3-geometry-buffer-sphere.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Sphere
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferSphere
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-tetrahedron.js b/src/r3-d3-geometry-buffer-tetrahedron.js
index ec5b004..1a629f1 100644
--- a/src/r3-d3-geometry-buffer-tetrahedron.js
+++ b/src/r3-d3-geometry-buffer-tetrahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Tetrahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferTetrahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-text.js b/src/r3-d3-geometry-buffer-text.js
index 280491e..dc75ce4 100644
--- a/src/r3-d3-geometry-buffer-text.js
+++ b/src/r3-d3-geometry-buffer-text.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Text
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferText
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-torus-knot.js b/src/r3-d3-geometry-buffer-torus-knot.js
index 89d244d..8c3d561 100644
--- a/src/r3-d3-geometry-buffer-torus-knot.js
+++ b/src/r3-d3-geometry-buffer-torus-knot.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.TorusKnot
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferTorusKnot
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-torus.js b/src/r3-d3-geometry-buffer-torus.js
index 64f36f1..d56fcb4 100644
--- a/src/r3-d3-geometry-buffer-torus.js
+++ b/src/r3-d3-geometry-buffer-torus.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Torus
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferTorus
  * @constructor
  */
diff --git a/src/r3-d3-geometry-buffer-tube.js b/src/r3-d3-geometry-buffer-tube.js
index 930a7a3..a379d15 100644
--- a/src/r3-d3-geometry-buffer-tube.js
+++ b/src/r3-d3-geometry-buffer-tube.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Buffer.Tube
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryBufferTube
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-box.js b/src/r3-d3-geometry-normal-box.js
index bfa27f7..3cd54dd 100644
--- a/src/r3-d3-geometry-normal-box.js
+++ b/src/r3-d3-geometry-normal-box.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Box
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalBox
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-circle.js b/src/r3-d3-geometry-normal-circle.js
index 0f8eed0..7f8461c 100644
--- a/src/r3-d3-geometry-normal-circle.js
+++ b/src/r3-d3-geometry-normal-circle.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Circle
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalCircle
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-cone.js b/src/r3-d3-geometry-normal-cone.js
index 930f787..42b815f 100644
--- a/src/r3-d3-geometry-normal-cone.js
+++ b/src/r3-d3-geometry-normal-cone.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Cone
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalCone
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-cylinder.js b/src/r3-d3-geometry-normal-cylinder.js
index cd1cf88..5ed7aef 100644
--- a/src/r3-d3-geometry-normal-cylinder.js
+++ b/src/r3-d3-geometry-normal-cylinder.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Cylinder
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalCylinder
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-dodecahedron.js b/src/r3-d3-geometry-normal-dodecahedron.js
index f33b499..ab405e8 100644
--- a/src/r3-d3-geometry-normal-dodecahedron.js
+++ b/src/r3-d3-geometry-normal-dodecahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Dodecahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalDodecahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-edges.js b/src/r3-d3-geometry-normal-edges.js
index 993a6c8..9f59967 100644
--- a/src/r3-d3-geometry-normal-edges.js
+++ b/src/r3-d3-geometry-normal-edges.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Edges
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalEdges
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-extrude.js b/src/r3-d3-geometry-normal-extrude.js
index 09288f4..3b09811 100644
--- a/src/r3-d3-geometry-normal-extrude.js
+++ b/src/r3-d3-geometry-normal-extrude.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Extrude
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalExtrude
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-icosahedron.js b/src/r3-d3-geometry-normal-icosahedron.js
index e707152..007f398 100644
--- a/src/r3-d3-geometry-normal-icosahedron.js
+++ b/src/r3-d3-geometry-normal-icosahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Icosahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalIcosahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-lathe.js b/src/r3-d3-geometry-normal-lathe.js
index 668dc86..0905aa3 100644
--- a/src/r3-d3-geometry-normal-lathe.js
+++ b/src/r3-d3-geometry-normal-lathe.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Lathe
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalLathe
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-octahedron.js b/src/r3-d3-geometry-normal-octahedron.js
index 1156927..6c99026 100644
--- a/src/r3-d3-geometry-normal-octahedron.js
+++ b/src/r3-d3-geometry-normal-octahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Octahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalOctahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-parametric.js b/src/r3-d3-geometry-normal-parametric.js
index 0744768..7a2e266 100644
--- a/src/r3-d3-geometry-normal-parametric.js
+++ b/src/r3-d3-geometry-normal-parametric.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Parametric
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalParametric
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-plane.js b/src/r3-d3-geometry-normal-plane.js
index 386201d..9a59fab 100644
--- a/src/r3-d3-geometry-normal-plane.js
+++ b/src/r3-d3-geometry-normal-plane.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Plane
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalPlane
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-polyhedron.js b/src/r3-d3-geometry-normal-polyhedron.js
index baa1c86..9cdd186 100644
--- a/src/r3-d3-geometry-normal-polyhedron.js
+++ b/src/r3-d3-geometry-normal-polyhedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Polyhedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalPolyhedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-ring.js b/src/r3-d3-geometry-normal-ring.js
index 7104b6a..1aea04b 100644
--- a/src/r3-d3-geometry-normal-ring.js
+++ b/src/r3-d3-geometry-normal-ring.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Ring
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalRing
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-shape.js b/src/r3-d3-geometry-normal-shape.js
index dcaa368..26a2707 100644
--- a/src/r3-d3-geometry-normal-shape.js
+++ b/src/r3-d3-geometry-normal-shape.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Shape
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalShape
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-sphere.js b/src/r3-d3-geometry-normal-sphere.js
index 4eaddf1..1a7de41 100644
--- a/src/r3-d3-geometry-normal-sphere.js
+++ b/src/r3-d3-geometry-normal-sphere.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Sphere
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalSphere
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-tetrahedron.js b/src/r3-d3-geometry-normal-tetrahedron.js
index 87d135f..bbc2ca1 100644
--- a/src/r3-d3-geometry-normal-tetrahedron.js
+++ b/src/r3-d3-geometry-normal-tetrahedron.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Tetrahedron
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalTetrahedron
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-text.js b/src/r3-d3-geometry-normal-text.js
index 3c358c2..a7cb5b3 100644
--- a/src/r3-d3-geometry-normal-text.js
+++ b/src/r3-d3-geometry-normal-text.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Text
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalText
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-torus-knot.js b/src/r3-d3-geometry-normal-torus-knot.js
index f52a867..2ec51b6 100644
--- a/src/r3-d3-geometry-normal-torus-knot.js
+++ b/src/r3-d3-geometry-normal-torus-knot.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.TorusKnot
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalTorusKnot
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-torus.js b/src/r3-d3-geometry-normal-torus.js
index 61182f2..e968246 100644
--- a/src/r3-d3-geometry-normal-torus.js
+++ b/src/r3-d3-geometry-normal-torus.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Torus
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalTorus
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-tube.js b/src/r3-d3-geometry-normal-tube.js
index 46e78e0..bb430f2 100644
--- a/src/r3-d3-geometry-normal-tube.js
+++ b/src/r3-d3-geometry-normal-tube.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Tube
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalTube
  * @constructor
  */
diff --git a/src/r3-d3-geometry-normal-wireframe.js b/src/r3-d3-geometry-normal-wireframe.js
index 3198057..4a37360 100644
--- a/src/r3-d3-geometry-normal-wireframe.js
+++ b/src/r3-d3-geometry-normal-wireframe.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Geometry.Normal.Wireframe
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiGeometryNormalWireframe
  * @constructor
  */
diff --git a/src/r3-d3-helper.js b/src/r3-d3-helper.js
index b6fb7c9..b602128 100644
--- a/src/r3-d3-helper.js
+++ b/src/r3-d3-helper.js
@@ -1,6 +1,6 @@
 /**
  * Helpers for displaying outlines or making 'invisible' scene objects visible
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param id
  * @param name
  * @param object
diff --git a/src/r3-d3-light-a.js b/src/r3-d3-light-a.js
index 7987883..de92b22 100644
--- a/src/r3-d3-light-a.js
+++ b/src/r3-d3-light-a.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiLight R3.D3.API.Light
  * @constructor
  */
diff --git a/src/r3-d3-light-ambient.js b/src/r3-d3-light-ambient.js
index 7d90149..d113c2e 100644
--- a/src/r3-d3-light-ambient.js
+++ b/src/r3-d3-light-ambient.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.Ambient
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiAmbientLight
  * @constructor
  */
diff --git a/src/r3-d3-light-directional.js b/src/r3-d3-light-directional.js
index 8648354..a51305f 100644
--- a/src/r3-d3-light-directional.js
+++ b/src/r3-d3-light-directional.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.Directional
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiDirectionalLight
  * @constructor
  */
diff --git a/src/r3-d3-light-hemisphere.js b/src/r3-d3-light-hemisphere.js
index add5070..5d12886 100644
--- a/src/r3-d3-light-hemisphere.js
+++ b/src/r3-d3-light-hemisphere.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.Directional
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiHemisphereLight
  * @constructor
  */
diff --git a/src/r3-d3-light-point.js b/src/r3-d3-light-point.js
index b25b747..de5eb40 100644
--- a/src/r3-d3-light-point.js
+++ b/src/r3-d3-light-point.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.Point
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPointLight
  * @constructor
  */
diff --git a/src/r3-d3-light-rect-area.js b/src/r3-d3-light-rect-area.js
index 95ee199..b3c9484 100644
--- a/src/r3-d3-light-rect-area.js
+++ b/src/r3-d3-light-rect-area.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.RectArea
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRectAreaLight
  * @constructor
  */
diff --git a/src/r3-d3-light-spot.js b/src/r3-d3-light-spot.js
index 2a8bf81..3eb3447 100644
--- a/src/r3-d3-light-spot.js
+++ b/src/r3-d3-light-spot.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Light.Spot
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiSpotLight
  * @constructor
  */
diff --git a/src/r3-d3-material-a.js b/src/r3-d3-material-a.js
index fa96484..21394f9 100644
--- a/src/r3-d3-material-a.js
+++ b/src/r3-d3-material-a.js
@@ -1,7 +1,7 @@
 /**
  * Material Superset - The apiMaterial properties get moved into the Material object itself, and then the instance is
  * created
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiMaterial R3.D3.API.Material
  * @property materialType
  * @constructor
diff --git a/src/r3-d3-mesh-0.js b/src/r3-d3-mesh-0.js
index 69288ec..b4852f6 100644
--- a/src/r3-d3-mesh-0.js
+++ b/src/r3-d3-mesh-0.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Mesh
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiD3ObjectMesh R3.D3.API.Mesh
  * @property geometry
  * @constructor
@@ -18,6 +18,12 @@ R3.D3.Mesh = function(
         };
     }
 
+    linkedObjects.parentMesh    = R3.D3.Mesh;
+    linkedObjects.parentScene   = R3.D3.Scene;
+    linkedObjects.materials     = [R3.D3.Material];
+    linkedObjects.geometry      = R3.D3.Geometry;
+    linkedObjects.skeleton      = R3.D3.Skeleton;
+
 	R3.D3.API.Mesh.call(
         this,
         apiD3ObjectMesh,
@@ -95,6 +101,10 @@ R3.D3.Mesh.prototype.constructor = R3.D3.Mesh;
  */
 R3.D3.Mesh.prototype.createInstance = function() {
 
+    this.updateInstance('rotation');
+    this.updateInstance('scale');
+    this.updateInstance('position');
+
     if (
         R3.Utils.UndefinedOrNull(this.geometry) ||
         R3.Utils.UndefinedOrNull(this.geometry.instance)
diff --git a/src/r3-d3-particle-engine.js b/src/r3-d3-particle-engine.js
index 17d42ca..45f3514 100644
--- a/src/r3-d3-particle-engine.js
+++ b/src/r3-d3-particle-engine.js
@@ -1,6 +1,6 @@
 /**
  * Creates a ParticleEngine object
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiParticleEngine R3.D3.API.ParticleEngine
  * @constructor
  */
diff --git a/src/r3-d3-particle.js b/src/r3-d3-particle.js
index 13bd2d5..19108f2 100644
--- a/src/r3-d3-particle.js
+++ b/src/r3-d3-particle.js
@@ -1,6 +1,6 @@
 /**
  * Creates a Particle object
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiParticle R3.D3.API.Particle
  * @constructor
  */
diff --git a/src/r3-d3-pass-0.js b/src/r3-d3-pass-0.js
index e4b5ca8..3aff256 100644
--- a/src/r3-d3-pass-0.js
+++ b/src/r3-d3-pass-0.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Pass
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPass R3.D3.API.Pass
  * @property passType
  * @constructor
diff --git a/src/r3-d3-pass-bloom.js b/src/r3-d3-pass-bloom.js
index 8725c1c..b98bfce 100644
--- a/src/r3-d3-pass-bloom.js
+++ b/src/r3-d3-pass-bloom.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Pass.Bloom
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPassBloom R3.D3.API.Pass.Bloom
  * @constructor
  */
diff --git a/src/r3-d3-pass-fxaa.js b/src/r3-d3-pass-fxaa.js
index 5c22618..67617c1 100644
--- a/src/r3-d3-pass-fxaa.js
+++ b/src/r3-d3-pass-fxaa.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Pass.FXAA
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPassFXAA R3.D3.API.Pass.FXAA
  * @constructor
  */
diff --git a/src/r3-d3-pass-render.js b/src/r3-d3-pass-render.js
index be32d0c..57fe8be 100644
--- a/src/r3-d3-pass-render.js
+++ b/src/r3-d3-pass-render.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Pass.Render
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPassRender R3.D3.API.Pass.Render
  * @constructor
  */
diff --git a/src/r3-d3-pass-ssao.js b/src/r3-d3-pass-ssao.js
index 5bd213b..85c9f00 100644
--- a/src/r3-d3-pass-ssao.js
+++ b/src/r3-d3-pass-ssao.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Pass.SSAO
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPassSSAO R3.D3.API.Pass.SSAO
  * @constructor
  */
diff --git a/src/r3-d3-physics-world.js b/src/r3-d3-physics-world.js
index c1105e8..701cb5d 100644
--- a/src/r3-d3-physics-world.js
+++ b/src/r3-d3-physics-world.js
@@ -100,7 +100,7 @@ R3.D3.PhysicsWorld.prototype.constructor = R3.D3.PhysicsWorld;
 
 /**
  * private
- * @returns {R3.D3.PhysicsWorld|R3.PhysicsRuntime.World|*}
+ * @returns {R3.D3.PhysicsWorld|R3.Runtime.Physics.World|*}
  */
 R3.D3.PhysicsWorld.prototype.createInstance = function() {
 
@@ -506,7 +506,7 @@ R3.D3.PhysicsWorld.FromObject = function(graphics, objectComponent) {
 // };
 //
 // /**
-//  * @param graphics R3.GraphicsRuntime
+//  * @param graphics R3.Runtime.Graphics
 //  * @param graphicsMesh  THREE.Mesh
 //  * @param mass Number
 //  * @param friction Number
@@ -670,7 +670,7 @@ R3.D3.PhysicsWorld.FromObject = function(graphics, objectComponent) {
 // };
 //
 // /**
-//  * @param graphics R3.GraphicsRuntime
+//  * @param graphics R3.Runtime.Graphics
 //  * @param graphicsMesh  THREE.Mesh
 //  * @returns {R3.D3.Shape}
 //  * @constructor
@@ -756,7 +756,7 @@ R3.D3.PhysicsWorld.FromObject = function(graphics, objectComponent) {
 //  * @param rayscale Number
 //  * @param maxTriangleDistance Number
 //  * @param createCompoundShape Boolean
-//  * @param graphics R3.GraphicsRuntime
+//  * @param graphics R3.Runtime.Graphics
 //  * @param triangleMeshShapes  R3.D3.Shape[]
 //  * @param createDebugView Boolean
 //  * @returns {R3.D3.RigidBody}
diff --git a/src/r3-d3-raycast-vehicle.js b/src/r3-d3-raycast-vehicle.js
index 433291d..b85d1ad 100644
--- a/src/r3-d3-raycast-vehicle.js
+++ b/src/r3-d3-raycast-vehicle.js
@@ -1,6 +1,6 @@
 /**
  * RaycastVehicle Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiRaycastVehicle R3.D3.API.RaycastVehicle
  * @constructor
  */
diff --git a/src/r3-d3-raycast-wheel.js b/src/r3-d3-raycast-wheel.js
index a64edaa..e81e0e0 100644
--- a/src/r3-d3-raycast-wheel.js
+++ b/src/r3-d3-raycast-wheel.js
@@ -1,6 +1,6 @@
 /**
  * RaycastWheel Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiRaycastWheel R3.D3.API.RaycastWheel
  * @constructor
  */
diff --git a/src/r3-d3-raycaster.js b/src/r3-d3-raycaster.js
index efb6170..35affdb 100644
--- a/src/r3-d3-raycaster.js
+++ b/src/r3-d3-raycaster.js
@@ -1,6 +1,6 @@
 /**
  * Raycaster for R3.D3
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRaycaster
  * @constructor
  */
diff --git a/src/r3-d3-render-target-a.js b/src/r3-d3-render-target-a.js
index 256c1f9..a0198b2 100644
--- a/src/r3-d3-render-target-a.js
+++ b/src/r3-d3-render-target-a.js
@@ -1,183 +1,102 @@
 /**
- * Renders a scene with a camera
- * @param graphics R3.GraphicsRuntime
- * @param apiRenderTarget R3.D3.API.RenderTarget
+ * R3.D3.RenderTarget
+ *
+ *  - This class can be used in two ways - either you can instantiate it directly, or it can be instantiated indirectly
+ *    through its child class(es) - in the latter case, use linkedObjects to bypass API component call
+ *
+ * @param parent
+ * @param apiComponent
+ * @param linkedObjects
  * @constructor
  */
 R3.D3.RenderTarget = function(
-    graphics,
-    apiRenderTarget
+    parent,
+    apiComponent,
+    linkedObjects
 ) {
 
-    this.graphics = graphics;
-    this.graphics.isNotThreeThrow();
+    if (R3.Utils.UndefinedOrNull(linkedObjects)) {
+        /**
+         * We are constructing this object 'as is' - use the API component to initialize it
+         */
 
-    if (R3.Utils.UndefinedOrNull(apiRenderTarget)) {
-        apiRenderTarget = {
-            renderTargetType : R3.D3.API.RenderTarget.TARGET_TYPE_NORMAL
-        };
+        R3.D3.API.RenderTarget.call(
+            this,
+            apiComponent,
+            apiComponent.width,
+            apiComponent.height,
+            apiComponent.scissor,
+            apiComponent.scissorTest,
+            apiComponent.viewport,
+            apiComponent.texture,
+            apiComponent.depthBuffer,
+            apiComponent.depthTexture,
+            apiComponent.stencilBuffer
+        );
+
+        linkedObjects = {
+            texture       : R3.D3.Texture,
+            depthTexture  : R3.D3.Texture
+        }
+
+    } else {
+        linkedObjects.texture = R3.D3.Texture;
+        linkedObjects.depthTexture = R3.D3.Texture;
     }
 
-	R3.D3.API.RenderTarget.call(
-        this,
-        apiRenderTarget.id,
-        apiRenderTarget.name,
-        apiRenderTarget.renderTargetType,
-        apiRenderTarget.parent,
-        apiRenderTarget.autoUpdateSize,
-        apiRenderTarget.width,
-        apiRenderTarget.height,
-        apiRenderTarget.scissor,
-        apiRenderTarget.scissorTest,
-        apiRenderTarget.viewport,
-        apiRenderTarget.texture,
-        apiRenderTarget.depthBuffer,
-        apiRenderTarget.depthTexture,
-        apiRenderTarget.stencilBuffer,
-        apiRenderTarget.textureParameters
-    );
-
     this.scissor = new R3.Vector4(
-        this.graphics,
-        this.scissor,
-        this
+        this,
+        this.scissor
     );
 
-    if (this.viewport instanceof R3.D3.API.Viewport) {
-        this.viewport = new R3.D3.Viewport(
-            this.graphics,
-            this.viewport
-        );
+    this.viewport = new R3.Vector4(
+        this,
+        this.viewport
+    );
+
+    if (this.texture instanceof R3.API.Component) {
+        this.texture = R3.Component.ConstructFromObject(this.texture);
     }
 
-    if (this.texture instanceof R3.D3.API.Texture) {
-        this.texture = new R3.D3.Texture(
-            this.graphics,
-            this.texture
-        )
-    }
-
-    if (this.depthTexture instanceof R3.D3.API.Texture) {
-        this.depthTexture = new R3.D3.Texture(
-            this.graphics,
-            this.depthTexture
-        )
+    if (this.depthTexture instanceof R3.API.Component) {
+        this.depthTexture = R3.Component.ConstructFromObject(this.depthTexture);
     }
 
     R3.Component.call(
         this,
-        {
-            'texture'       : R3.D3.Texture,
-            'depthTexture'  : R3.D3.Texture,
-            'viewport'      : R3.D3.Viewport
-        }
+        parent,
+        linkedObjects
     );
 };
 
 R3.D3.RenderTarget.prototype = Object.create(R3.Component.prototype);
 R3.D3.RenderTarget.prototype.constructor = R3.D3.RenderTarget;
 
-R3.D3.RenderTarget.prototype.applyToInstance = function() {
-
-    this.instance.scissor       = this.scissor.instance;
-    this.instance.scissorTest   = this.scissorTest;
-    this.instance.viewport      = this.viewport.instance;
-    this.instance.depthBuffer   = this.depthBuffer;
-    this.instance.stencilBuffer = this.stencilBuffer;
-
-    if (this.instance.texture) {
-
-        if (R3.Utils.UndefinedOrNull(this.texture)) {
-            this.texture = new R3.D3.Texture(this.graphics);
-            this.texture.instance = this.instance.texture;
-            this.texture.updateFromInstance();
-        } else {
-            this.texture.instance = this.instance.texture;
-            this.texture.applyToInstance();
-        }
-
-        this.emit(
-            R3.Event.TEXTURE_INSTANCE_UPDATED,
-            {
-                texture : this.texture
-            }
-        );
-    }
-
-    if (this.instance.depthTexture) {
-
-        if (R3.Utils.UndefinedOrNull(this.depthTexture)) {
-            this.depthTexture = new R3.D3.Texture(this.graphics);
-            this.depthTexture.instance = this.instance.depthTexture;
-            this.depthTexture.updateFromInstance();
-        } else {
-            this.depthTexture.instance = this.instance.depthTexture;
-            this.depthTexture.applyToInstance();
-        }
-
-        this.emit(
-            R3.Event.TEXTURE_INSTANCE_UPDATED,
-            {
-                texture : this.depthTexture
-            }
-        );
-    }
-
-};
-
 /**
  * Creates a Render Target instance
  * @returns {*}
  */
 R3.D3.RenderTarget.prototype.createInstance = function() {
 
-    if (this.autoUpdateSize) {
-        R3.Utils.UpdateWindowSize(this);
-    }
+    this.instance = this.graphics.RenderTarget(
+        this.width,
+        this.height,
+        this.texture.wrapS,
+        this.texture.wrapT,
+        this.texture.magFilter,
+        this.texture.minFilter,
+        this.texture.format,
+        this.texture.storageType,
+        this.texture.anisotropy,
+        this.texture.encoding
+    );
 
-    /**
-     * Only create the instance if it does not already exist - it could be created by a child
-     */
-    if (R3.Utils.UndefinedOrNull(this.instance)) {
-        this.instance = new THREE.WebGLRenderTarget(
-            this.width,
-            this.height,
-            this.textureParameters
-        );
-    }
+    this.instance.depthBuffer   = this.depthBuffer;
+    this.instance.stencilBuffer = this.stencilBuffer;
 
-    /**
-     * We have two cases - our texure is null, in this case, we create one and update it from instance,
-     * Or, we loaded it from API, so our texture is up to date, and we should update our instance
-     */
-
-    if (R3.Utils.UndefinedOrNull(this.texture)) {
-
-        /**
-         * We need to generate a new texture and update it from the instance (we provide an overrideInstance)
-         */
-        this.texture = new R3.D3.Texture(
-            this.graphics,
-            null,
-            this.instance.texture
-        );
-
-    } else {
-
-        /**
-         * This texture is loaded from the API, we assign the instance to it, and then apply our settings to it
-         */
-        this.texture.instance = this.instance.texture;
-        this.texture.applyToInstance();
-
-    }
-
-    if (R3.Utils.Defined(this.depthTexture)) {
-        this.depthTexture.instance = this.instance.depthTexture;
-        this.depthTexture.applyToInstance();
-    }
-
-    this.applyToInstance();
+    this.instance.scissor       = this.scissor.instance;
+    this.instance.scissorTest   = this.scissorTest.instance;
+    this.instance.viewport      = this.viewport.instance;
 
     R3.Component.prototype.createInstance.call(this);
 };
@@ -189,29 +108,14 @@ R3.D3.RenderTarget.prototype.updateInstance = function(property) {
 
     if (
         property === 'width' ||
-        property === 'height' ||
-        property === 'autoUpdateSize'
+        property === 'height'
     ) {
-
-        if (this.autoUpdateSize) {
-            R3.Utils.UpdateWindowSize(this);
-        }
-
         this.instance.setSize(this.width, this.height);
-    }
-
-    if (property === 'renderTargetType') {
-        console.warn('todo : update renderTargetType');
-        return;
-    }
-
-    if (property === 'parent') {
-        console.warn('todo : update parent');
         return;
     }
 
     if (property === 'scissor') {
-        console.warn('todo : update scissor');
+        this.instance.scissor = this.scissor.instance;
         return;
     }
 
@@ -221,19 +125,12 @@ R3.D3.RenderTarget.prototype.updateInstance = function(property) {
     }
 
     if (property === 'viewport') {
-        if (this.viewport && this.viewport.instance) {
-            this.instance.viewport = this.viewport.instance;
-        } else {
-            this.instance.viewport = null;
-        }
+        this.instance.viewport = this.viewport.instance;
         return;
     }
 
     if (property === 'texture') {
-        console.warn('experimental texture change');
-        if (this.texture && this.texture.instance) {
-            this.instance.texture = this.texture.instance;
-        }
+        console.warn('TODO: update texture');
         return;
     }
 
@@ -243,10 +140,7 @@ R3.D3.RenderTarget.prototype.updateInstance = function(property) {
     }
 
     if (property === 'depthTexture') {
-        console.warn('experimental depthTexture change');
-        if (this.depthTexture && this.depthTexture.instance) {
-            this.instance.depthTexture = this.depthTexture.instance;
-        }
+        console.warn('TODO: update depthTexture');
         return;
     }
 
@@ -255,81 +149,11 @@ R3.D3.RenderTarget.prototype.updateInstance = function(property) {
         return;
     }
 
-    if (property === 'textureParameters') {
-        console.warn('todo: texture parameters change');
+    if (property === 'depthBuffer') {
+        this.instance.depthBuffer = this.depthBuffer;
         return;
     }
 
     R3.Component.prototype.updateInstance.call(this, property);
 
 };
-
-/**
- * Render Target to API Render Target
- * @returns {R3.D3.API.RenderTarget}
- */
-R3.D3.RenderTarget.prototype.toApiObject = function() {
-
-    var apiRenderTarget = new R3.D3.API.RenderTarget(
-        this.id,
-        this.name,
-        this.renderTargetType,
-        R3.Utils.IdOrNull(this.parent),
-        this.autoUpdateSize,
-        this.width,
-        this.height,
-        this.scissor.toApiObject(),
-        this.scissorTest,
-        R3.Utils.IdOrNull(this.viewport),
-        R3.Utils.IdOrNull(this.texture),
-        this.depthBuffer,
-        R3.Utils.IdOrNull(this.depthTexture),
-        this.stencilBuffer,
-        this.textureParameters
-    );
-
-    return apiRenderTarget;
-};
-
-/**
- * Updates R3.D3.RenderTarget from instance
- */
-R3.D3.RenderTarget.prototype.updateFromInstance = function() {
-
-        this.width              = this.instance.width;
-        this.height             = this.instance.height;
-
-        this.scissor.x          = this.instance.scissor.x;
-        this.scissor.y          = this.instance.scissor.y;
-        this.scissor.z          = this.instance.scissor.z;
-        this.scissor.w          = this.instance.scissor.w;
-
-        this.scissorTest        = this.instance.scissorTest;
-
-        this.viewport.x         = this.instance.viewport.x;
-        this.viewport.y         = this.instance.viewport.y;
-        this.viewport.width     = this.instance.viewport.z;
-        this.viewport.height    = this.instance.viewport.w;
-
-        if (this.texture.instance) {
-            if (R3.Utils.UndefinedOrNull(this.texture)) {
-                this.texture = new R3.D3.Texture(this.graphics);
-            }
-            this.texture.instance   = this.instance.texture;
-            this.texture.updateFromInstance();
-        }
-
-        this.depthBuffer        = this.instance.depthBuffer;
-
-        if (this.instance.depthTexture) {
-
-            if (R3.Utils.UndefinedOrNull(this.depthTexture)) {
-                this.depthTexture = new R3.D3.Texture(this.graphics);
-            }
-
-            this.depthTexture.instance = this.instance.depthTexture;
-            this.depthTexture.updateFromInstance();
-        }
-
-        this.stencilBuffer      = this.instance.stencilBuffer;
-};
\ No newline at end of file
diff --git a/src/r3-d3-render-target-cube.js b/src/r3-d3-render-target-cube.js
index 1dbc312..a895aa9 100644
--- a/src/r3-d3-render-target-cube.js
+++ b/src/r3-d3-render-target-cube.js
@@ -1,6 +1,6 @@
 /**
  * Renders a scene with a camera
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRenderTargetCube R3.D3.API.RenderTarget.Cube
  * @constructor
  */
diff --git a/src/r3-d3-rigid-body.js b/src/r3-d3-rigid-body.js
index ed67bc5..ad75fbf 100644
--- a/src/r3-d3-rigid-body.js
+++ b/src/r3-d3-rigid-body.js
@@ -1,6 +1,6 @@
 /**
  * RigidBody Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiRigidBody R3.D3.API.RigidBody
  * @constructor
  */
diff --git a/src/r3-d3-shader-a.js b/src/r3-d3-shader-a.js
index f815f40..49f4ba9 100644
--- a/src/r3-d3-shader-a.js
+++ b/src/r3-d3-shader-a.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shader
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiShader R3.D3.API.Shader
  * @constructor
  */
diff --git a/src/r3-d3-shader-fragment.js b/src/r3-d3-shader-fragment.js
index 97caae3..1e10358 100644
--- a/src/r3-d3-shader-fragment.js
+++ b/src/r3-d3-shader-fragment.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shader.Fragment
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiFragmentShader
  * @constructor
  */
diff --git a/src/r3-d3-shader-vertex.js b/src/r3-d3-shader-vertex.js
index dc97deb..2aa4774 100644
--- a/src/r3-d3-shader-vertex.js
+++ b/src/r3-d3-shader-vertex.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shader.Vertex
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiVertexShader
  * @constructor
  */
diff --git a/src/r3-d3-shadow-a.js b/src/r3-d3-shadow-a.js
index 227bc22..ce09690 100644
--- a/src/r3-d3-shadow-a.js
+++ b/src/r3-d3-shadow-a.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shadow
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiShadow R3.D3.API.Shadow
  * @constructor
  */
diff --git a/src/r3-d3-shadow-directional.js b/src/r3-d3-shadow-directional.js
index 5820e28..67877b5 100644
--- a/src/r3-d3-shadow-directional.js
+++ b/src/r3-d3-shadow-directional.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shadow.Directional
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiDirectionalShadow
  * @constructor
  */
diff --git a/src/r3-d3-shadow-spot.js b/src/r3-d3-shadow-spot.js
index eabfe11..b28a014 100644
--- a/src/r3-d3-shadow-spot.js
+++ b/src/r3-d3-shadow-spot.js
@@ -1,6 +1,6 @@
 /**
  * R3.D3.Shadow.Spot
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiSpotShadow
  * @constructor
  */
diff --git a/src/r3-d3-shape-0.js b/src/r3-d3-shape-0.js
index a866d45..4853441 100644
--- a/src/r3-d3-shape-0.js
+++ b/src/r3-d3-shape-0.js
@@ -1,6 +1,6 @@
 /**
  * Shape Superset - The apiShape properties get moved into the Shape object itself, and then the instance is created
- * @param physics R3.PhysicsRuntime
+ * @param physics R3.Runtime.Physics
  * @param apiShape R3.D3.API.Shape
  * @constructor
  */
@@ -81,7 +81,7 @@ R3.D3.Shape.prototype.toApiObject = function() {
 
 /**
  * Converts a standard object mesh to a R3.D3.Shape
- * @param physics R3.PhysicsRuntime
+ * @param physics R3.Runtime.Physics
  * @param objectShape {Object}
  * @constructor
  */
diff --git a/src/r3-d3-skeleton.js b/src/r3-d3-skeleton.js
index f2747e6..40cff25 100644
--- a/src/r3-d3-skeleton.js
+++ b/src/r3-d3-skeleton.js
@@ -1,7 +1,7 @@
 /**
  * Skeleton Superset
  * @constructor
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiSkeleton R3.D3.API.Skeleton
  */
 R3.D3.Skeleton = function Skeleton(
@@ -209,7 +209,7 @@ R3.D3.Skeleton.prototype.toApiObject = function() {
 
 /**
  * Returns a R3.D3.Skeleton from a skeleton Object
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param objectSkeleton Object
  * @returns {R3.D3.Skeleton}
  * @constructor
diff --git a/src/r3-d3-solver.js b/src/r3-d3-solver.js
index 8067e27..4bdc89a 100644
--- a/src/r3-d3-solver.js
+++ b/src/r3-d3-solver.js
@@ -1,6 +1,6 @@
 /**
  * Solver Runtime
- * @param physics R3.GraphicsRuntime
+ * @param physics R3.Runtime.Graphics
  * @param apiSolver R3.D3.API.Solver
  * @constructor
  */
diff --git a/src/r3-d3-spline.js b/src/r3-d3-spline.js
index cabba0e..1694dd1 100644
--- a/src/r3-d3-spline.js
+++ b/src/r3-d3-spline.js
@@ -1,6 +1,6 @@
 /**
  * Spline constructor
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiSpline R3.D3.API.Spline
  * @constructor
  */
@@ -110,7 +110,7 @@ R3.D3.Spline.prototype.toApiObject = function() {
 
 /**
  * Returns a R3.D3.Spline from a spline Object
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param objectComponent Object
  * @returns {R3.D3.Spline}
  * @constructor
diff --git a/src/r3-d3-texture-a.js b/src/r3-d3-texture-a.js
index e79e783..002dd74 100644
--- a/src/r3-d3-texture-a.js
+++ b/src/r3-d3-texture-a.js
@@ -2,7 +2,7 @@
  * Texture Superset - The apiTexture properties get moved into the Texture object itself, and then the instance is
  * created
  * @param apiTexture
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param overrideInstance
  * @property textureType
  * @constructor
diff --git a/src/r3-d3-viewport.js b/src/r3-d3-viewport.js
index b90dcac..09fb115 100644
--- a/src/r3-d3-viewport.js
+++ b/src/r3-d3-viewport.js
@@ -1,6 +1,6 @@
 /**
  * Viewport Runtime
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiViewport R3.D3.API.Viewport
  * @constructor
  */
diff --git a/src/r3-graphics-runtime-a.js b/src/r3-graphics-runtime-a.js
deleted file mode 100644
index fe1f035..0000000
--- a/src/r3-graphics-runtime-a.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * R3.GraphicsRuntime
- * @constructor
- */
-R3.GraphicsRuntime = function() {};
-
-R3.GraphicsRuntime.prototype.Vector2 = function(x,y) {
-    console.warn('override Vector2 in child class');
-};
-
-R3.GraphicsRuntime.prototype.Vector3 = function(x,y,z) {
-    console.warn('override Vector3 in child class');
-};
-
-R3.GraphicsRuntime.prototype.Vector4 = function(x,y,z,w) {
-    console.warn('override Vector4 in child class');
-};
-
-R3.GraphicsRuntime.prototype.Box3 = function(x,y,z) {
-    console.warn('override Box3 in child class');
-};
-
-R3.GraphicsRuntime.prototype.Color = function(r,g,b,a) {
-    console.warn('override Color in child class');
-};
-
-R3.GraphicsRuntime.prototype.Matrix4 = function(rows) {
-    console.warn('override Matrix4 in child class');
-};
-
-R3.GraphicsRuntime.prototype.Quaternion = function(x, y, z, w) {
-    console.warn('override Quaternion in child class');
-};
-
-
-/**
- * R3.GraphicsRuntime Types
- * @type {number}
- */
-R3.GraphicsRuntime.TYPE_THREE = 0x1;
\ No newline at end of file
diff --git a/src/r3-graphics-runtime-three.js b/src/r3-graphics-runtime-three.js
deleted file mode 100644
index 948199d..0000000
--- a/src/r3-graphics-runtime-three.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * R3.GraphicsRuntime.Three
- * @constructor
- */
-R3.GraphicsRuntime.Three = function() {
-
-    R3.GraphicsRuntime.call(
-        this
-    );
-
-    this.createInstance();
-};
-
-R3.GraphicsRuntime.Three.prototype = Object.create(R3.GraphicsRuntime.prototype);
-R3.GraphicsRuntime.Three.prototype.constructor = R3.GraphicsRuntime.Three;
-
-/**
- * Create R3.GraphicsRuntime.Three Instance
- * @returns {*}
- */
-R3.GraphicsRuntime.Three.prototype.createInstance = function() {
-    this.instance = THREE;
-};
-
-R3.GraphicsRuntime.Three.prototype.Vector2 = function(x,y) {
-    return new this.instance.Vector2(x,y,z);
-};
-
-R3.GraphicsRuntime.Three.prototype.Vector3 = function(x,y,z) {
-    return new this.instance.Vector3(x,y,z);
-};
-
-R3.GraphicsRuntime.Three.prototype.Vector4 = function(x,y,z,w) {
-    return new this.instance.Quaternion(x,y,z,w);
-};
-
-R3.GraphicsRuntime.Three.prototype.Color = function(r,g,b,a) {
-    return new this.instance.Color(r,g,b,a);
-};
-
-R3.GraphicsRuntime.Three.prototype.Matrix4 = function(rows) {
-    
-    var instance = new THREE.Matrix4();
-
-    /**
-     * We transpose our matrix when we send it to three since we use a different ordering system
-     * They say they use
-     */
-    instance.set(
-        rows[0].x,
-        rows[1].x,
-        rows[2].x,
-        rows[3].x,
-        rows[0].y,
-        rows[1].y,
-        rows[2].y,
-        rows[3].y,
-        rows[0].z,
-        rows[1].z,
-        rows[2].z,
-        rows[3].z,
-        rows[0].w,
-        rows[1].w,
-        rows[2].w,
-        rows[3].w
-    );
-
-    return instance;
-};
-
-/**
- * R3.GraphicsRuntime.Three.prototype.Box3
- * @param min {R3.Vector3|R3.API.Vector3}
- * @param max {R3.Vector3|R3.API.Vector3}
- * @returns {*|R3.Box3|R3.API.Box3|R3.API.Box3|R3.Box3|R3.API.Box3}
- * @constructor
- */
-R3.GraphicsRuntime.Three.prototype.Box3 = function(min,max) {
-    return new this.instance.Box3(min.instance, max.instance);
-};
-
-R3.GraphicsRuntime.Three.prototype.Quaternion = function(x, y, z, w) {
-    return new this.instance.Quaternion(x,y,z,w);
-};
\ No newline at end of file
diff --git a/src/r3-gui-runtime.js b/src/r3-gui-runtime.js
deleted file mode 100644
index b964ddc..0000000
--- a/src/r3-gui-runtime.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * GUI
- * @param id
- * @param name
- * @param guiType
- * @constructor
- */
-R3.GUIRuntime = function(
-    id,
-    name,
-    guiType
-) {
-    if (R3.Utils.UndefinedOrNull(id)) {
-        id = R3.Utils.RandomId();
-    }
-    this.id = id;
-
-    if (R3.Utils.UndefinedOrNull(name)) {
-        name = 'GUI (' + id + ')';
-    }
-    this.name = name;
-
-    if (R3.Utils.UndefinedOrNull(guiType)) {
-        guiType = R3.GUIRuntime.TYPE_DAT_GUI;
-    }
-    this.guiType = guiType;
-
-    this.createInstance();
-};
-
-/**
- * R3.GUIRuntime Types
- * @type {number}
- */
-R3.GUIRuntime.TYPE_DAT_GUI = 0x1;
-
-R3.GUIRuntime.prototype.createInstance = function() {
-    if (this.guiType === R3.GUIRuntime.TYPE_DAT_GUI) {
-        this.instance = dat.GUI;
-    } else {
-        this.instance = null;
-    }
-};
-
-R3.GUIRuntime.prototype.updateInstance = function(property) {
-    if (property === 'guiType') {
-        this.createInstance();
-    }
-};
-
-/**
- * Logs a warning and throws an error if not cannon
- */
-R3.GUIRuntime.prototype.isNotDatGuiThrow = function() {
-    if (this.instance !== dat.GUI) {
-        console.error('Only dat.gui supported');
-        throw new Error('Only dat.gui supported');
-    }
-};
diff --git a/src/r3-gui.js b/src/r3-gui.js
index 0572480..335b90e 100644
--- a/src/r3-gui.js
+++ b/src/r3-gui.js
@@ -66,7 +66,7 @@ R3.GUI.prototype.toApiObject = function() {
 
 /**
  * Converts from an Object GUI to a R3.GUI
- * @param guiRuntime R3.GUIRuntime
+ * @param guiRuntime R3.Runtime.GUI
  * @param objectGUI Object
  * @returns {R3.GUI}
  * @constructor
diff --git a/src/r3-physics-runtime-cannon.js b/src/r3-physics-runtime-cannon.js
deleted file mode 100644
index e1dd934..0000000
--- a/src/r3-physics-runtime-cannon.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * R3.PhysicsRuntime.Cannon
- * @constructor
- */
-R3.PhysicsRuntime.Cannon = function() {
-    this.createInstance();
-};
-
-R3.PhysicsRuntime.Cannon.prototype = Object.create(R3.PhysicsRuntime.prototype);
-R3.PhysicsRuntime.Cannon.prototype.constructor = R3.PhysicsRuntime.Cannon;
-
-R3.PhysicsRuntime.Cannon.prototype.createInstance = function() {
-    this.instance = CANNON;
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Vector2 = function(x,y) {
-    return new this.instance.Vec2(x,y,z);
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Vector3 = function(x,y,z) {
-    return new this.instance.Vec3(x,y,z);
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Vector4 = function(x,y,z,w) {
-    return new this.instance.Vec4(x,y,z,w);
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Matrix4 = function(rows) {
-    console.warn('TODO: implement cannon physics matrix 4');
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Box3 = function(min,max) {
-    console.log('return cannon implementation of box3')
-};
-
-R3.PhysicsRuntime.Cannon.prototype.Quaternion = function(x,y,z,w) {
-    console.log('return cannon implementation of quaternion')
-};
diff --git a/src/r3-physics-runtime.js b/src/r3-physics-runtime.js
deleted file mode 100644
index ad45bc2..0000000
--- a/src/r3-physics-runtime.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * R3.PhysicsRuntime
- * @constructor
- */
-R3.PhysicsRuntime = function() {};
-
-R3.PhysicsRuntime.prototype.Vector2 = function(x,y) {
-    console.warn('override Vector2 in child class');
-};
-
-R3.PhysicsRuntime.prototype.Vector3 = function(x,y,z) {
-    console.warn('override Vector3 in child class');
-};
-
-R3.PhysicsRuntime.prototype.Vector4 = function(x,y,z,w) {
-    console.warn('override Vector4 in child class');
-};
-
-R3.PhysicsRuntime.prototype.Matrix4 = function(rows) {
-    console.warn('override Matrix4 in child class');
-};
-
-R3.PhysicsRuntime.prototype.Box3 = function(rows) {
-    console.warn('override Box3 in child class');
-};
-
-R3.PhysicsRuntime.prototype.Quaternion = function(x,y,z,w) {
-    console.log('override Quaternion in child class')
-};
-
-/**
- * R3.PhysicsRuntime Types
- * @type {number}
- */
-R3.PhysicsRuntime.TYPE_CANNON_JS = 0x1;
diff --git a/src/r3-plane.js b/src/r3-plane.js
index 2428036..b806e6f 100644
--- a/src/r3-plane.js
+++ b/src/r3-plane.js
@@ -1,6 +1,6 @@
 /**
  * Creates a Plane object
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiPlane R3.API.Plane
  * @constructor
  */
@@ -87,7 +87,7 @@ R3.Plane.prototype.toApiObject = function() {
 
 /**
  * Converts from an Object Plane to a R3.Plane
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param objectPlane Object
  * @returns {R3.Plane}
  * @constructor
diff --git a/src/r3-renderer-d3-canvas-target.js b/src/r3-renderer-d3-canvas-target.js
index eff20b5..2930603 100644
--- a/src/r3-renderer-d3-canvas-target.js
+++ b/src/r3-renderer-d3-canvas-target.js
@@ -1,6 +1,6 @@
 /**
  * R3.Renderer.D3.Canvas.Target
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRendererD3 R3.API.Renderer.D3
  * @constructor
  */
diff --git a/src/r3-renderer-d3-canvas.js b/src/r3-renderer-d3-canvas.js
index 57174e6..952820d 100644
--- a/src/r3-renderer-d3-canvas.js
+++ b/src/r3-renderer-d3-canvas.js
@@ -1,6 +1,6 @@
 /**
  * R3.Renderer.D3.Canvas
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRendererD3 R3.API.Renderer.D3
  * @constructor
  */
diff --git a/src/r3-renderer-d3-target.js b/src/r3-renderer-d3-target.js
index 93cd86d..03f7e5d 100644
--- a/src/r3-renderer-d3-target.js
+++ b/src/r3-renderer-d3-target.js
@@ -1,6 +1,6 @@
 /**
  * R3.Renderer.D3.Target
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRendererD3 R3.API.Renderer.D3
  * @constructor
  */
diff --git a/src/r3-renderer-d3.js b/src/r3-renderer-d3.js
index d81bfa0..cc2b5b3 100644
--- a/src/r3-renderer-d3.js
+++ b/src/r3-renderer-d3.js
@@ -1,6 +1,6 @@
 /**
  * R3.Renderer.D3
- * @param graphics R3.GraphicsRuntime
+ * @param graphics R3.Runtime.Graphics
  * @param apiRendererD3 R3.API.Renderer.D3
  * @constructor
  */
diff --git a/src/r3-runtime-coder-codemirror.js b/src/r3-runtime-coder-codemirror.js
new file mode 100644
index 0000000..604f420
--- /dev/null
+++ b/src/r3-runtime-coder-codemirror.js
@@ -0,0 +1,19 @@
+/**
+ * R3.Runtime.Coder.CodeMirror
+ * @constructor
+ */
+R3.Runtime.Coder.CodeMirror = function() {
+
+    R3.Runtime.Coder.call(
+        this
+    );
+
+    this.createInstance();
+};
+
+R3.Runtime.Coder.CodeMirror.prototype = Object.create(R3.Runtime.Coder.prototype);
+R3.Runtime.Coder.CodeMirror.prototype.constructor = R3.Runtime.Coder.CodeMirror;
+
+R3.Runtime.Coder.CodeMirror.prototype.createInstance = function() {
+    this.instance = CodeMirror;
+};
diff --git a/src/r3-runtime-coder.js b/src/r3-runtime-coder.js
new file mode 100644
index 0000000..440a324
--- /dev/null
+++ b/src/r3-runtime-coder.js
@@ -0,0 +1,11 @@
+/**
+ * R3.Runtime.Coder
+ * @constructor
+ */
+R3.Runtime.Coder = function() {
+    R3.Runtime.call(this);
+};
+
+R3.Runtime.Coder.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.Coder.prototype.constructor = R3.Runtime.Coder;
+
diff --git a/src/r3-runtime-graphics-three.js b/src/r3-runtime-graphics-three.js
new file mode 100644
index 0000000..04e4de1
--- /dev/null
+++ b/src/r3-runtime-graphics-three.js
@@ -0,0 +1,408 @@
+/**
+ * R3.Runtime.Graphics.Three
+ * @constructor
+ */
+R3.Runtime.Graphics.Three = function() {
+
+    R3.Runtime.Graphics.call(
+        this
+    );
+
+    this.createInstance();
+};
+
+R3.Runtime.Graphics.Three.prototype = Object.create(R3.Runtime.Graphics.prototype);
+R3.Runtime.Graphics.Three.prototype.constructor = R3.Runtime.Graphics.Three;
+
+/**
+ * Create R3.Runtime.Graphics.Three Instance
+ * @returns {*}
+ */
+R3.Runtime.Graphics.Three.prototype.createInstance = function() {
+    this.instance = true;
+};
+
+R3.Runtime.Graphics.Three.prototype.Vector2 = function(x,y) {
+    return new THREE.Vector2(x,y,z);
+};
+
+R3.Runtime.Graphics.Three.prototype.Vector3 = function(x,y,z) {
+    return new THREE.Vector3(x,y,z);
+};
+
+R3.Runtime.Graphics.Three.prototype.Vector4 = function(x,y,z,w) {
+    return new THREE.Quaternion(x,y,z,w);
+};
+
+R3.Runtime.Graphics.Three.prototype.Color = function(r,g,b,a) {
+    return new THREE.Color(r,g,b,a);
+};
+
+R3.Runtime.Graphics.Three.prototype.Matrix4 = function(rows) {
+    
+    var instance = new THREE.Matrix4();
+
+    /**
+     * We transpose our matrix when we send it to three since we use a different ordering system
+     * They say they use
+     */
+    instance.set(
+        rows[0].x,
+        rows[1].x,
+        rows[2].x,
+        rows[3].x,
+        rows[0].y,
+        rows[1].y,
+        rows[2].y,
+        rows[3].y,
+        rows[0].z,
+        rows[1].z,
+        rows[2].z,
+        rows[3].z,
+        rows[0].w,
+        rows[1].w,
+        rows[2].w,
+        rows[3].w
+    );
+
+    return instance;
+};
+
+R3.Runtime.Graphics.Three.prototype.Box3 = function(min,max) {
+    return new THREE.Box3(min.instance, max.instance);
+};
+
+R3.Runtime.Graphics.Three.prototype.Quaternion = function(x, y, z, w) {
+    return new THREE.Quaternion(x,y,z,w);
+};
+
+R3.Runtime.Graphics.Three.prototype.Clock = function() {
+    return new THREE.Clock();
+};
+
+R3.Runtime.Graphics.Three.prototype.EditorControls = function(canvas, camera) {
+
+    if (!canvas || !canvas.instance) {
+        throw new Error('no canvas instance at time of EditorControls creation');
+    }
+
+    if (!camera || !camera.instance) {
+        throw new Error('no camera instance at time of EditorControls creation');
+    }
+    
+    return new THREE.EditorControls(
+        camera.instance,
+        canvas.instance
+    );
+};
+
+R3.Runtime.Graphics.Three.prototype.OrbitControls = function(
+    canvas,
+    camera,
+    target,
+    enabled,
+    minPolarAngle,
+    maxPolarAngle,
+    enableDamping,
+    dampingFactor,
+    enableZoom,
+    zoomSpeed,
+    enableRotate,
+    rotateSpeed,
+    enablePan,
+    keyPanSpeed,
+    autoRotate,
+    autoRotateSpeed,
+    enableKeys
+) {
+
+    if (!canvas || !canvas.instance) {
+        throw new Error('no canvas instance at time of OrbitControls creation');
+    }
+
+    if (!camera || !camera.instance) {
+        throw new Error('no camera instance at time of OrbitControls creation');
+    }
+
+    var controls = new THREE.OrbitControls(
+        camera.instance,
+        canvas.instance
+    );
+
+    if (target && target.instance) {
+        controls.target = target.instance.position;
+    }
+
+    controls.enabled       = enabled;
+    controls.minPolarAngle = minPolarAngle;
+    controls.maxPolarAngle = maxPolarAngle;
+    controls.enableDamping = enableDamping;
+    controls.dampingFactor = dampingFactor;
+    controls.enableZoom    = enableZoom;
+    controls.zoomSpeed     = zoomSpeed;
+    controls.enableRotate  = enableRotate;
+    controls.rotateSpeed   = rotateSpeed;
+    controls.enablePan     = enablePan;
+    controls.keyPanSpeed   = keyPanSpeed;
+    controls.autoRotate    = autoRotate;
+    controls.autoRotateSpeed = autoRotateSpeed;
+    controls.enableKeys    = enableKeys;
+
+    return controls;
+
+};
+
+R3.Runtime.Graphics.Three.prototype.FirstPersonControls = function(
+    canvas,
+    camera,
+    enabled,
+    movementSpeed,
+    lookSpeed,
+    lookVertical,
+    autoForward,
+    activeLook,
+    heightSpeed,
+    heightCoef,
+    heightMin,
+    heightMax,
+    constrainVertical,
+    verticalMin,
+    verticalMax,
+    autoSpeedFactor
+) {
+    
+    if (!canvas || !canvas.instance) {
+        throw new Error('no canvas instance at time of OrbitControls creation');
+    }
+
+    if (!camera || !camera.instance) {
+        throw new Error('no camera instance at time of OrbitControls creation');
+    }
+
+    var controls = new THREE.FirstPersonControls(
+        camera.instance,
+        canvas.instance
+    );
+
+    controls.enabled           = enabled;
+    controls.movementSpeed     = movementSpeed;
+    controls.lookSpeed         = lookSpeed;
+    controls.lookVertical      = lookVertical;
+    controls.autoForward       = autoForward;
+    controls.activeLook        = activeLook;
+    controls.heightSpeed       = heightSpeed;
+    controls.heightCoef        = heightCoef;
+    controls.heightMin         = heightMin;
+    controls.heightMax         = heightMax;
+    controls.constrainVertical = constrainVertical;
+    controls.verticalMin       = verticalMin;
+    controls.verticalMax       = verticalMax;
+    controls.autoSpeedFactor   = autoSpeedFactor;
+
+    return controls;
+};
+
+R3.Runtime.Graphics.Three.prototype.Curve = function(arcLenghDivisions) {
+    var curve = new THREE.Curve();
+    curve.arcLenghDivisions = arcLenghDivisions;
+    return curve;
+};
+
+R3.Runtime.Graphics.Three.prototype.CurvePath = function(curves, autoClose) {
+
+    var curvePath = new THREE.CurvePath();
+
+    curvePath.curves = curves.reduce(
+        function(result, curve){
+
+            if (!curve.instance) {
+                throw new Error('curve instance not ready');
+            }
+
+            result.push(curve.instance);
+            return result;
+        },
+        []
+    );
+
+    curvePath.autoClose = autoClose;
+
+    return curvePath;
+};
+
+R3.Runtime.Graphics.Three.prototype.Path = function(points) {
+
+    return new THREE.Path(
+        points.map(
+            function(point) {
+
+                if (!point.instance) {
+                    throw new Error('no point instance');
+                }
+
+                return point.instance;
+            }
+        )
+    );
+
+};
+
+R3.Runtime.Graphics.Three.prototype.Shape = function(points) {
+
+    return new THREE.Shape(
+        points.map(
+            function(point) {
+
+                if (!point.instance) {
+                    throw new Error('no point instance');
+                }
+
+                return point.instance;
+            }
+        )
+    );
+
+};
+
+/**
+ * Returns an Audio object - this object still has to load so don't do anything with it yet
+ * @param component
+ * @param path
+ * @param loop
+ * @param volume
+ * @param cameraIndex
+ * @returns {boolean|*}
+ * @constructor
+ */
+R3.Runtime.Graphics.Three.prototype.Audio = function(
+    component,
+    path,
+    loop,
+    volume,
+    cameraIndex
+) {
+
+    /**
+     * First off - fuck microsoft - their audio doesn't work
+     */
+    if (document.documentMode || /Edge/.test(navigator.userAgent)) {
+        return true;
+    }
+
+    var audio = null;
+
+    R3.Event.Emit(
+        R3.Event.GET_PROJECT,
+        null,
+        function(project) {
+
+            var camera = project.cameras[cameraIndex];
+
+            if (R3.Utils.UndefinedOrNull(camera) ||
+                R3.Utils.UndefinedOrNull(camera.instance)) {
+                throw new Error('Camera not ready for audio');
+            }
+
+            R3.Event.Emit(
+                R3.Event.GET_API_URL,
+                null,
+                function (data) {
+
+
+                    /**
+                     * Get the API URL
+                     */
+                    var apiUrl = data.apiUrl;
+
+                    /**
+                     * We need a listener and add it to the camera
+                     * @type {THREE.AudioListener}
+                     */
+                    var listener = new THREE.AudioListener();
+                    camera.instance.add(listener);
+
+                    /**
+                     * We need an audio object
+                     */
+                    audio = new THREE.Audio(listener);
+
+                    /**
+                     * Now we need to load the audio file
+                     */
+                    var audioLoader = new THREE.AudioLoader();
+
+                    console.log('loading audio : ' + component.name);
+
+                    try {
+                        audioLoader.load(
+                            apiUrl + path + '?ts=' + Date.now(),
+                            function (buffer) {
+
+                                console.log('loaded audio: ' + component.name);
+
+                                audio.setBuffer(buffer);
+                                audio.setLoop(loop);
+                                audio.setVolume(volume);
+
+                                R3.Component.prototype.createInstance.call(component);
+                            }
+                        );
+                    } catch (error) {
+                        console.warn('failed to load audio - does it exist? : ' + error.message || 'unknown reason');
+                        return true;
+                    }
+
+                }
+            );
+        }
+    );
+
+    return audio;
+
+};
+
+R3.Runtime.Graphics.Three.prototype.Bone = function() {
+    return new THREE.Bone();
+};
+
+R3.Runtime.Graphics.Three.prototype.CubeCamera = function(near, far, cubeResolution) {
+
+    return new THREE.CubeCamera(
+        near,
+        far,
+        cubeResolution
+    );
+
+};
+
+R3.Runtime.Graphics.Three.prototype.RenderTarget = function(
+    width,
+    height,
+    wrapS,
+    wrapT,
+    magFilter,
+    minFilter,
+    format,
+    type,
+    anisotropy,
+    encoding,
+    depthBuffer,
+    stencilBuffer
+) {
+    return new THREE.WebGLRenderTarget(
+        this.width,
+        this.height,
+        {
+            wrapS           : wrapS,
+            wrapT           : wrapT,
+            magFilter       : magFilter,
+            minFilter       : minFilter,
+            format          : format,
+            type            : type,
+            anisotropy      : anisotropy,
+            encoding        : encoding,
+            depthBuffer     : depthBuffer,
+            stencilBuffer   : stencilBuffer,
+        }
+    );
+};
\ No newline at end of file
diff --git a/src/r3-runtime-graphics.js b/src/r3-runtime-graphics.js
new file mode 100644
index 0000000..4f57b44
--- /dev/null
+++ b/src/r3-runtime-graphics.js
@@ -0,0 +1,107 @@
+/**
+ * R3.Runtime.Graphics
+ * @constructor
+ */
+R3.Runtime.Graphics = function() {
+
+    R3.Runtime.call(this);
+
+};
+
+R3.Runtime.Graphics.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.Graphics.prototype.constructor = R3.Runtime.Graphics;
+
+R3.Runtime.Graphics.prototype.Vector2 = function(x,y) {
+    console.warn('override Vector2 in child class');
+};
+
+R3.Runtime.Graphics.prototype.Vector3 = function(x,y,z) {
+    console.warn('override Vector3 in child class');
+};
+
+R3.Runtime.Graphics.prototype.Vector4 = function(x,y,z,w) {
+    console.warn('override Vector4 in child class');
+};
+
+R3.Runtime.Graphics.prototype.Box3 = function(x,y,z) {
+    console.warn('override Box3 in child class');
+};
+
+R3.Runtime.Graphics.prototype.Color = function(r,g,b,a) {
+    console.warn('override Color in child class');
+};
+
+R3.Runtime.Graphics.prototype.Matrix4 = function(rows) {
+    console.warn('override Matrix4 in child class');
+};
+
+R3.Runtime.Graphics.prototype.Quaternion = function(x, y, z, w) {
+    console.warn('override Quaternion in child class');
+};
+
+R3.Runtime.Graphics.prototype.Clock = function() {
+    console.warn('override Clock in child class');
+};
+
+R3.Runtime.Graphics.prototype.EditorControls = function(canvas, camera) {
+    console.warn('override EditorControls in child class');
+};
+
+R3.Runtime.Graphics.prototype.OrbitControls = function(canvas, camera) {
+    console.warn('override OrbitControls in child class');
+};
+
+R3.Runtime.Graphics.prototype.FirstPersonControls = function(canvas, camera) {
+    console.warn('override FirstPersonControls in child class');
+};
+
+R3.Runtime.Graphics.prototype.Curve = function(arcLenghDivisions) {
+    console.warn('override Curve in child class');
+};
+
+R3.Runtime.Graphics.prototype.CurvePath = function(curves, autoClose) {
+    console.warn('override CurvePath in child class');
+};
+
+R3.Runtime.Graphics.prototype.Path = function(points) {
+    console.warn('override Path in child class');
+};
+
+R3.Runtime.Graphics.prototype.Shape = function(points) {
+    console.warn('override Shape in child class');
+};
+
+R3.Runtime.Graphics.prototype.Audio = function(
+    component,
+    path,
+    loop,
+    volume,
+    cameraIndex
+) {
+    console.warn('override Shape in child class');
+};
+
+R3.Runtime.Graphics.prototype.Bone = function() {
+    console.warn('override Shape in child class');
+};
+
+R3.Runtime.Graphics.prototype.CubeCamera = function(near, far, cubeResolution) {
+    console.warn('override Shape in child class');
+};
+
+R3.Runtime.Graphics.prototype.RenderTarget = function(
+    width,
+    height,
+    wrapS,
+    wrapT,
+    magFilter,
+    minFilter,
+    format,
+    type,
+    anisotropy,
+    encoding,
+    depthBuffer,
+    stencilBuffer
+) {
+    console.warn('override Shape in child class');
+};
diff --git a/src/r3-runtime-gui-datgui.js b/src/r3-runtime-gui-datgui.js
new file mode 100644
index 0000000..8078480
--- /dev/null
+++ b/src/r3-runtime-gui-datgui.js
@@ -0,0 +1,19 @@
+/**
+ * R3.Runtime.GUI.DatGUI
+ * @constructor
+ */
+R3.Runtime.GUI.DatGUI = function() {
+
+    R3.Runtime.GUI.call(
+        this
+    );
+
+    this.createInstance();
+};
+
+R3.Runtime.GUI.DatGUI.prototype = Object.create(R3.Runtime.GUI.prototype);
+R3.Runtime.GUI.DatGUI.prototype.constructor = R3.Runtime.GUI.DatGUI;
+
+R3.Runtime.GUI.prototype.createInstance = function() {
+    this.instance = dat.GUI;
+};
diff --git a/src/r3-runtime-gui.js b/src/r3-runtime-gui.js
new file mode 100644
index 0000000..6b0b795
--- /dev/null
+++ b/src/r3-runtime-gui.js
@@ -0,0 +1,12 @@
+/**
+ * R3.Runtime.GUI
+ * @constructor
+ */
+R3.Runtime.GUI = function() {
+
+    R3.Runtime.call(this);
+
+};
+
+R3.Runtime.GUI.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.GUI.prototype.constructor = R3.Runtime.GUI;
diff --git a/src/r3-runtime-physics-cannon.js b/src/r3-runtime-physics-cannon.js
new file mode 100644
index 0000000..50a634d
--- /dev/null
+++ b/src/r3-runtime-physics-cannon.js
@@ -0,0 +1,60 @@
+/**
+ * R3.Runtime.Physics.Cannon
+ * @constructor
+ */
+R3.Runtime.Physics.Cannon = function() {
+
+    R3.Runtime.Physics.call(
+        this
+    );
+
+    this.createInstance();
+
+};
+
+R3.Runtime.Physics.Cannon.prototype = Object.create(R3.Runtime.Physics.prototype);
+R3.Runtime.Physics.Cannon.prototype.constructor = R3.Runtime.Physics.Cannon;
+
+R3.Runtime.Physics.Cannon.prototype.createInstance = function() {
+    this.instance = true;
+};
+
+R3.Runtime.Physics.Cannon.prototype.Vector2 = function(x,y) {
+    return new CANNON.Vec2(x,y,z);
+};
+
+R3.Runtime.Physics.Cannon.prototype.Vector3 = function(x,y,z) {
+    return new CANNON.Vec3(x,y,z);
+};
+
+R3.Runtime.Physics.Cannon.prototype.Vector4 = function(x,y,z,w) {
+    return new CANNON.Vec4(x,y,z,w);
+};
+
+R3.Runtime.Physics.Cannon.prototype.Matrix4 = function(rows) {
+    console.warn('TODO: implement cannon physics matrix 4');
+};
+
+R3.Runtime.Physics.Cannon.prototype.Box3 = function(min,max) {
+    console.log('return cannon implementation of box3')
+};
+
+R3.Runtime.Physics.Cannon.prototype.Quaternion = function(x,y,z,w) {
+    console.log('return cannon implementation of quaternion')
+};
+
+R3.Runtime.Physics.Cannon.prototype.Broadphase = function(broadphaseType) {
+
+    switch (broadphaseType) {
+
+        case R3.D3.Broadphase.BROADPHASE_TYPE_NAIVE :
+            return new CANNON.NaiveBroadphase();
+        case R3.D3.Broadphase.BROADPHASE_TYPE_GRID :
+            return new CANNON.GridBroadphase();
+        case R3.D3.Broadphase.BROADPHASE_TYPE_SAP :
+            return new CANNON.SAPBroadphase();
+        default :
+            throw new Error('Unknown broadphase type');
+    }
+
+};
\ No newline at end of file
diff --git a/src/r3-runtime-physics.js b/src/r3-runtime-physics.js
new file mode 100644
index 0000000..5dcc154
--- /dev/null
+++ b/src/r3-runtime-physics.js
@@ -0,0 +1,40 @@
+/**
+ * R3.Runtime.Physics
+ * @constructor
+ */
+R3.Runtime.Physics = function() {
+
+    R3.Runtime.call(this);
+
+};
+
+R3.Runtime.Physics.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.Physics.prototype.constructor = R3.Runtime.Physics;
+
+R3.Runtime.Physics.prototype.Vector2 = function(x,y) {
+    console.warn('override Vector2 in child class');
+};
+
+R3.Runtime.Physics.prototype.Vector3 = function(x,y,z) {
+    console.warn('override Vector3 in child class');
+};
+
+R3.Runtime.Physics.prototype.Vector4 = function(x,y,z,w) {
+    console.warn('override Vector4 in child class');
+};
+
+R3.Runtime.Physics.prototype.Matrix4 = function(rows) {
+    console.warn('override Matrix4 in child class');
+};
+
+R3.Runtime.Physics.prototype.Box3 = function(rows) {
+    console.warn('override Box3 in child class');
+};
+
+R3.Runtime.Physics.prototype.Quaternion = function(x,y,z,w) {
+    console.log('override Quaternion in child class')
+};
+
+R3.Runtime.Physics.prototype.Broadphase = function(broadphaseType) {
+    console.log('override Quaternion in child class')
+};
diff --git a/src/r3-runtime-sockets-websockjet.js b/src/r3-runtime-sockets-websockjet.js
new file mode 100644
index 0000000..78eb445
--- /dev/null
+++ b/src/r3-runtime-sockets-websockjet.js
@@ -0,0 +1,24 @@
+/**
+ * R3.Runtime.Sockets.Websocket
+ * @constructor
+ */
+R3.Runtime.Sockets.Websocket = function() {
+
+    R3.Runtime.Sockets.call(
+        this
+    );
+
+    this.createInstance();
+};
+
+R3.Runtime.Sockets.Websocket.prototype = Object.create(R3.Runtime.Sockets.prototype);
+R3.Runtime.Sockets.Websocket.prototype.constructor = R3.Runtime.Sockets.Websocket;
+
+R3.Runtime.Sockets.Websocket.prototype.createInstance = function() {
+    this.instance = WebSocket;
+};
+
+R3.Runtime.Sockets.Websocket.prototype.connect = function(server) {
+    var connection = new WebSocket(server.protocol + '://' + server.ip + ':' + server.port , server.protocols);
+    this.connections.push(connection);
+};
diff --git a/src/r3-runtime-sockets.js b/src/r3-runtime-sockets.js
new file mode 100644
index 0000000..871a7e4
--- /dev/null
+++ b/src/r3-runtime-sockets.js
@@ -0,0 +1,16 @@
+/**
+ * R3.Runtime.Sockets
+ * @constructor
+ */
+R3.Runtime.Sockets = function() {
+
+    R3.Runtime.call(this);
+
+};
+
+R3.Runtime.Sockets.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.Sockets.prototype.constructor = R3.Runtime.Sockets;
+
+R3.Runtime.Sockets.prototype.connect = function(server) {
+    console.warn('Please override connect in the child class');
+};
diff --git a/src/r3-runtime-statistics-stats.js b/src/r3-runtime-statistics-stats.js
new file mode 100644
index 0000000..0ac6340
--- /dev/null
+++ b/src/r3-runtime-statistics-stats.js
@@ -0,0 +1,21 @@
+/**
+ * R3.Runtime.Statistics.Stats
+ * @constructor
+ */
+R3.Runtime.Statistics.Stats = function() {
+
+    R3.Runtime.Statistics.call(
+        this
+    );
+
+    this.createInstance();
+
+};
+
+R3.Runtime.Statistics.Stats.prototype = Object.create(R3.Runtime.Statistics.prototype);
+R3.Runtime.Statistics.Stats.prototype.constructor = R3.Runtime.Statistics.Stats;
+
+
+R3.Runtime.Statistics.Stats.prototype.createInstance = function() {
+    this.instance = Stats;
+};
diff --git a/src/r3-runtime-statistics.js b/src/r3-runtime-statistics.js
new file mode 100644
index 0000000..0592f29
--- /dev/null
+++ b/src/r3-runtime-statistics.js
@@ -0,0 +1,12 @@
+/**
+ * R3.Runtime.Statistics
+ * @constructor
+ */
+R3.Runtime.Statistics = function() {
+
+    R3.Runtime.call(this);
+
+};
+
+R3.Runtime.Statistics.prototype = Object.create(R3.Runtime.prototype);
+R3.Runtime.Statistics.prototype.constructor = R3.Runtime.Statistics;
diff --git a/src/r3-runtime.js b/src/r3-runtime.js
new file mode 100644
index 0000000..8a1f3e1
--- /dev/null
+++ b/src/r3-runtime.js
@@ -0,0 +1,10 @@
+/**
+ * R3.Runtime
+ *
+ * All Runtimes should extend this
+ *
+ * @constructor
+ */
+R3.Runtime = function() {
+
+};
diff --git a/src/r3-sockets-runtime.js b/src/r3-sockets-runtime.js
deleted file mode 100644
index 31c6a66..0000000
--- a/src/r3-sockets-runtime.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Sockets
- * @param id
- * @param name
- * @param socketsType
- * @constructor
- */
-R3.SocketsRuntime = function(
-    id,
-    name,
-    socketsType
-) {
-    if (R3.Utils.UndefinedOrNull(id)) {
-        id = R3.Utils.RandomId();
-    }
-    this.id = id;
-
-    if (R3.Utils.UndefinedOrNull(name)) {
-        name = 'Sockets (' + id + ')';
-    }
-    this.name = name;
-
-    if (R3.Utils.UndefinedOrNull(socketsType)) {
-        socketsType = R3.SocketsRuntime.TYPE_WEB_SOCKET;
-    }
-    this.socketsType = socketsType;
-
-    this.connections = [];
-
-    this.createInstance();
-};
-
-/**
- * R3.SocketsRuntime Types
- * @type {number}
- */
-R3.SocketsRuntime.TYPE_WEB_SOCKET = 0x1;
-
-R3.SocketsRuntime.prototype.createInstance = function() {
-    if (this.socketsType === R3.SocketsRuntime.TYPE_WEB_SOCKET) {
-        this.instance = WebSocket;
-    } else {
-        this.instance = null;
-    }
-};
-
-R3.SocketsRuntime.prototype.connect = function(server) {
-    var connection = new WebSocket(server.protocol + '://' + server.ip + ':' + server.port , server.protocols);
-    this.connections.push(connection);
-};
-
-R3.SocketsRuntime.prototype.updateInstance = function(property) {
-    if (property === 'socketsType') {
-        this.createInstance();
-    }
-};
-
-/**
- * Logs a warning and throws an error if not cannon
- */
-R3.SocketsRuntime.prototype.isNotWebSocketThrow = function() {
-    if (this.instance !== WebSocket) {
-        console.error('Only WebSocket supported');
-        throw new Error('Only WebSocket supported');
-    }
-};
diff --git a/src/r3-statistics-runtime.js b/src/r3-statistics-runtime.js
deleted file mode 100644
index 269703d..0000000
--- a/src/r3-statistics-runtime.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Statistics
- * @param id
- * @param name
- * @param statisticsType
- * @constructor
- */
-R3.StatisticsRuntime = function(
-    id,
-    name,
-    statisticsType
-) {
-    if (R3.Utils.UndefinedOrNull(id)) {
-        id = R3.Utils.RandomId();
-    }
-    this.id = id;
-
-    if (R3.Utils.UndefinedOrNull(name)) {
-        name = 'Statistics (' + id + ')';
-    }
-    this.name = name;
-
-    if (R3.Utils.UndefinedOrNull(statisticsType)) {
-        statisticsType = R3.StatisticsRuntime.TYPE_STATS;
-    }
-    this.statisticsType = statisticsType;
-
-    this.createInstance();
-};
-
-/**
- * R3.StatisticsRuntime Types
- * @type {number}
- */
-R3.StatisticsRuntime.TYPE_STATS = 0x1;
-
-R3.StatisticsRuntime.prototype.createInstance = function() {
-    if (this.statisticsType === R3.StatisticsRuntime.TYPE_STATS) {
-        this.instance = Stats;
-    } else {
-        this.instance = null;
-    }
-};
-
-R3.StatisticsRuntime.prototype.updateInstance = function(property) {
-    if (property === 'statisticsType') {
-        this.createInstance();
-    }
-};
-
-/**
- * Logs a warning and throws an error if not cannon
- */
-R3.StatisticsRuntime.prototype.isNotStatsThrow = function() {
-    if (this.instance !== Stats) {
-        console.error('Only stats supported');
-        throw new Error('Only stats supported');
-    }
-};
diff --git a/src/r3-stats.js b/src/r3-stats.js
index 875e3f8..eed7636 100644
--- a/src/r3-stats.js
+++ b/src/r3-stats.js
@@ -73,7 +73,7 @@ R3.Stats.prototype.toApiObject = function() {
 
 /**
  * Converts from an Object Stats to a R3.Stats
- * @param statisticsRuntime R3.StatisticsRuntime
+ * @param statisticsRuntime R3.Runtime.Statistics
  * @param objectStats Object
  * @returns {R3.Stats}
  * @constructor
diff --git a/src/r3-system-gui.js b/src/r3-system-gui.js
index bec92b0..c3a62e4 100644
--- a/src/r3-system-gui.js
+++ b/src/r3-system-gui.js
@@ -473,7 +473,7 @@ R3.System.GUI.prototype.buildVectorControl = function(folder, componentTemplate,
 
 	var controllers = [];
 
-	if (R3.Utils.isVector4(object[property])) {
+	if (R3.Utils.IsVector4(object[property])) {
 		controllers.push(this.controller(folder, object, property, 'w', step, listen, affected));
 	}
 
@@ -481,8 +481,8 @@ R3.System.GUI.prototype.buildVectorControl = function(folder, componentTemplate,
 	controllers.push(this.controller(folder, object, property, 'y', step, listen, affected));
 
 	if (
-		R3.Utils.isVector3(object[property]) ||
-		R3.Utils.isVector4(object[property])
+		R3.Utils.IsVector3(object[property]) ||
+		R3.Utils.IsVector4(object[property])
 	) {
 		controllers.push(this.controller(folder, object, property, 'z', step, listen, affected));
 	}
@@ -872,13 +872,13 @@ R3.System.GUI.prototype.buildControl = function(folder, componentTemplate, prope
 	var controllers = [];
 
 	if (
-		R3.Utils.isString(object[property]) ||
-		R3.Utils.isBoolean(object[property])
+		R3.Utils.IsString(object[property]) ||
+		R3.Utils.IsBoolean(object[property])
 	) {
 		controllers.push(folder.add(object, property));
 	}
 
-	if (R3.Utils.isNumber(object[property])) {
+	if (R3.Utils.IsNumber(object[property])) {
 
 		var grain = 0.001;