diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index e9fc053..f731cb4 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -33,10 +33,10 @@
 
     bindShader(shader)
     {
-        let glShader = shader.glShaders[renderer.CONTEXT_UID] || this.generateShader(shader);
+        let glShader = shader.glShaders[this.renderer.CONTEXT_UID] || this.generateShader(shader);
 
         this.renderer._bindGLShader(glShader);
-        this.syncUniforms(glShader, shader);
+//        this.syncUniforms(glShader, shader);
 
     }
 
@@ -58,7 +58,7 @@
         };
         console.log(glShader.dirtyFlags)
 
-        shader.glShaders[renderer.CONTEXT_UID] = glShader;
+        shader.glShaders[this.renderer.CONTEXT_UID] = glShader;
 
 
         return glShader
@@ -84,7 +84,7 @@
         {
             if(dirtyFlags[i] === uniformData[i].dirtyId)
             {
-                continue;
+                //continue;
             }
 
             dirtyFlags[i] = uniformData[i].dirtyId;
@@ -93,7 +93,8 @@
             {
                 if (uniformData[i].value.baseTexture)
                 {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount);
+                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
+              //      console.log( glShader.uniforms[i])
                 }
                 else
                 {
@@ -154,6 +155,7 @@
     }
 
 
+
     /**
      * Destroys this manager and removes all its textures
      */

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index e9fc053..f731cb4 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -33,10 +33,10 @@
 
     bindShader(shader)
     {
-        let glShader = shader.glShaders[renderer.CONTEXT_UID] || this.generateShader(shader);
+        let glShader = shader.glShaders[this.renderer.CONTEXT_UID] || this.generateShader(shader);
 
         this.renderer._bindGLShader(glShader);
-        this.syncUniforms(glShader, shader);
+//        this.syncUniforms(glShader, shader);
 
     }
 
@@ -58,7 +58,7 @@
         };
         console.log(glShader.dirtyFlags)
 
-        shader.glShaders[renderer.CONTEXT_UID] = glShader;
+        shader.glShaders[this.renderer.CONTEXT_UID] = glShader;
 
 
         return glShader
@@ -84,7 +84,7 @@
         {
             if(dirtyFlags[i] === uniformData[i].dirtyId)
             {
-                continue;
+                //continue;
             }
 
             dirtyFlags[i] = uniformData[i].dirtyId;
@@ -93,7 +93,8 @@
             {
                 if (uniformData[i].value.baseTexture)
                 {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount);
+                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
+              //      console.log( glShader.uniforms[i])
                 }
                 else
                 {
@@ -154,6 +155,7 @@
     }
 
 
+
     /**
      * Destroys this manager and removes all its textures
      */
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 098507f..780fce9 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,6 +1,8 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
 
+let UID = 0;
+
 // let math = require('../../../math');
 /**
  * @class
@@ -63,7 +65,7 @@
         this.glShaders = {};
 
 
-
+        this.id = UID++;
     }
 
 

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index e9fc053..f731cb4 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -33,10 +33,10 @@
 
     bindShader(shader)
     {
-        let glShader = shader.glShaders[renderer.CONTEXT_UID] || this.generateShader(shader);
+        let glShader = shader.glShaders[this.renderer.CONTEXT_UID] || this.generateShader(shader);
 
         this.renderer._bindGLShader(glShader);
-        this.syncUniforms(glShader, shader);
+//        this.syncUniforms(glShader, shader);
 
     }
 
@@ -58,7 +58,7 @@
         };
         console.log(glShader.dirtyFlags)
 
-        shader.glShaders[renderer.CONTEXT_UID] = glShader;
+        shader.glShaders[this.renderer.CONTEXT_UID] = glShader;
 
 
         return glShader
@@ -84,7 +84,7 @@
         {
             if(dirtyFlags[i] === uniformData[i].dirtyId)
             {
-                continue;
+                //continue;
             }
 
             dirtyFlags[i] = uniformData[i].dirtyId;
@@ -93,7 +93,8 @@
             {
                 if (uniformData[i].value.baseTexture)
                 {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount);
+                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
+              //      console.log( glShader.uniforms[i])
                 }
                 else
                 {
@@ -154,6 +155,7 @@
     }
 
 
+
     /**
      * Destroys this manager and removes all its textures
      */
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 098507f..780fce9 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,6 +1,8 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
 
+let UID = 0;
+
 // let math = require('../../../math');
 /**
  * @class
@@ -63,7 +65,7 @@
         this.glShaders = {};
 
 
-
+        this.id = UID++;
     }
 
 
diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js
index 7e29f46..7f96afc 100644
--- a/src/mesh/Mesh.js
+++ b/src/mesh/Mesh.js
@@ -40,6 +40,14 @@
          * @see PIXI.mesh.Mesh.DRAW_MODES
          */
         this.drawMode = drawMode;
+
+        this.uniforms = {};
+
+//        geometry//
+//        shader//
+//        uniforms//
+//        state//
+
     }
 
     /**

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index e9fc053..f731cb4 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -33,10 +33,10 @@
 
     bindShader(shader)
     {
-        let glShader = shader.glShaders[renderer.CONTEXT_UID] || this.generateShader(shader);
+        let glShader = shader.glShaders[this.renderer.CONTEXT_UID] || this.generateShader(shader);
 
         this.renderer._bindGLShader(glShader);
-        this.syncUniforms(glShader, shader);
+//        this.syncUniforms(glShader, shader);
 
     }
 
@@ -58,7 +58,7 @@
         };
         console.log(glShader.dirtyFlags)
 
-        shader.glShaders[renderer.CONTEXT_UID] = glShader;
+        shader.glShaders[this.renderer.CONTEXT_UID] = glShader;
 
 
         return glShader
@@ -84,7 +84,7 @@
         {
             if(dirtyFlags[i] === uniformData[i].dirtyId)
             {
-                continue;
+                //continue;
             }
 
             dirtyFlags[i] = uniformData[i].dirtyId;
@@ -93,7 +93,8 @@
             {
                 if (uniformData[i].value.baseTexture)
                 {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount);
+                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
+              //      console.log( glShader.uniforms[i])
                 }
                 else
                 {
@@ -154,6 +155,7 @@
     }
 
 
+
     /**
      * Destroys this manager and removes all its textures
      */
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 098507f..780fce9 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,6 +1,8 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
 
+let UID = 0;
+
 // let math = require('../../../math');
 /**
  * @class
@@ -63,7 +65,7 @@
         this.glShaders = {};
 
 
-
+        this.id = UID++;
     }
 
 
diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js
index 7e29f46..7f96afc 100644
--- a/src/mesh/Mesh.js
+++ b/src/mesh/Mesh.js
@@ -40,6 +40,14 @@
          * @see PIXI.mesh.Mesh.DRAW_MODES
          */
         this.drawMode = drawMode;
+
+        this.uniforms = {};
+
+//        geometry//
+//        shader//
+//        uniforms//
+//        state//
+
     }
 
     /**
diff --git a/src/mesh/geometry/Geometry.js b/src/mesh/geometry/Geometry.js
index 28971df..be4ab48 100644
--- a/src/mesh/geometry/Geometry.js
+++ b/src/mesh/geometry/Geometry.js
@@ -3,6 +3,7 @@
 import GeometryStyle from './GeometryStyle';
 import GeometryData from './GeometryData';
 
+var UID = 0;
 class Geometry
 {
 
@@ -13,6 +14,7 @@
 
 	    this.glVertexArrayObjects = [];
 
+	    this.id = UID++;
 	}
 
 	addAttribute(id, buffer, size = 2, stride = 0, start = 0, normalised = false)

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index e9fc053..f731cb4 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -33,10 +33,10 @@
 
     bindShader(shader)
     {
-        let glShader = shader.glShaders[renderer.CONTEXT_UID] || this.generateShader(shader);
+        let glShader = shader.glShaders[this.renderer.CONTEXT_UID] || this.generateShader(shader);
 
         this.renderer._bindGLShader(glShader);
-        this.syncUniforms(glShader, shader);
+//        this.syncUniforms(glShader, shader);
 
     }
 
@@ -58,7 +58,7 @@
         };
         console.log(glShader.dirtyFlags)
 
-        shader.glShaders[renderer.CONTEXT_UID] = glShader;
+        shader.glShaders[this.renderer.CONTEXT_UID] = glShader;
 
 
         return glShader
@@ -84,7 +84,7 @@
         {
             if(dirtyFlags[i] === uniformData[i].dirtyId)
             {
-                continue;
+                //continue;
             }
 
             dirtyFlags[i] = uniformData[i].dirtyId;
@@ -93,7 +93,8 @@
             {
                 if (uniformData[i].value.baseTexture)
                 {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount);
+                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
+              //      console.log( glShader.uniforms[i])
                 }
                 else
                 {
@@ -154,6 +155,7 @@
     }
 
 
+
     /**
      * Destroys this manager and removes all its textures
      */
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 098507f..780fce9 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,6 +1,8 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
 
+let UID = 0;
+
 // let math = require('../../../math');
 /**
  * @class
@@ -63,7 +65,7 @@
         this.glShaders = {};
 
 
-
+        this.id = UID++;
     }
 
 
diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js
index 7e29f46..7f96afc 100644
--- a/src/mesh/Mesh.js
+++ b/src/mesh/Mesh.js
@@ -40,6 +40,14 @@
          * @see PIXI.mesh.Mesh.DRAW_MODES
          */
         this.drawMode = drawMode;
+
+        this.uniforms = {};
+
+//        geometry//
+//        shader//
+//        uniforms//
+//        state//
+
     }
 
     /**
diff --git a/src/mesh/geometry/Geometry.js b/src/mesh/geometry/Geometry.js
index 28971df..be4ab48 100644
--- a/src/mesh/geometry/Geometry.js
+++ b/src/mesh/geometry/Geometry.js
@@ -3,6 +3,7 @@
 import GeometryStyle from './GeometryStyle';
 import GeometryData from './GeometryData';
 
+var UID = 0;
 class Geometry
 {
 
@@ -13,6 +14,7 @@
 
 	    this.glVertexArrayObjects = [];
 
+	    this.id = UID++;
 	}
 
 	addAttribute(id, buffer, size = 2, stride = 0, start = 0, normalised = false)
diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js
index f88cd50..5913771 100644
--- a/src/mesh/webgl/MeshRenderer.js
+++ b/src/mesh/webgl/MeshRenderer.js
@@ -26,7 +26,7 @@
     onContextChange()
     {
         this.gl = this.renderer.gl;
-
+        this.CONTEXT_UID = this.renderer.CONTEXT_UID
         // nothing to see here!
     }