diff --git a/TODO.md b/TODO.md
index 6aa03f6..18a586c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,6 +2,11 @@ BUILD
 
 - [x] single import
 
+REFACTOR
+
+- [ ] controller-* => gui-*
+- [ ] gui.define* => gui.var*
+
 PARITY
 
 - [ ] folders
diff --git a/examples/index.html b/examples/index.html
index 78f10e3..bf634d3 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -6,8 +6,8 @@
     <title>dat-gui kitchen sink</title>
     
     
-    <!-- <script src="../build/gui.js"></script> -->
-    <link rel="import" href="../gui.html">
+    <script src="../build/gui.js"></script>
+    <!-- <link rel="import" href="../gui.html"> -->
 
     <meta name="viewport" content="width=device-width, user-scalable=no">
     
diff --git a/gulpfile.js b/gulpfile.js
index 980d50f..2a387ca 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -11,10 +11,11 @@ var paths = {
     lint:   [ 'gulpfile.js', 'elements/**/*.js' ],
     test:   [ 'build/gui.js', 'tests/*.js' ],
     clean:  [ 'build/*', '**/*.css' ],
-    docs:   [ 'README.md', 'docs/*' ]
+    docs:   [ 'README.md', 'docs/*' ],
+    shim:   [ 'elements/shim.js' ]
 };
 
-gulp.task( 'default', [ 'docs', 'lint', 'build' ] );
+gulp.task( 'default', [ 'docs', 'lint', 'shim', 'build' ] );
 
 gulp.task( 'watch', [ 'default' ], function() {
 
@@ -26,6 +27,7 @@ gulp.task( 'watch', [ 'default' ], function() {
     gulp.watch( paths.docs, [ 'docs' ] );
     gulp.watch( paths.lint, [ 'lint' ] );
     gulp.watch( paths.build, [ 'build' ] );
+    gulp.watch( paths.shim, [ 'shim' ] );
 
 } );
 
@@ -76,13 +78,21 @@ gulp.task( 'jshint', function() {
 
 } );
 
-
 gulp.task( 'css', function() {
 
     return css( 'elements/**/*.styl', 'elements' );
 
 } );
 
+gulp.task( 'shim', function() {
+    
+    return gulp.src( paths.shim )
+        .pipe( $.uglify() )
+        .pipe( $.rename( 'gui.shim.js' ) )
+        .pipe( gulp.dest( 'build' ) );
+
+} );
+
 gulp.task( 'docs', function() {
 
     css( 'docs/*.styl', 'docs' );
diff --git a/package.json b/package.json
index 126d265..2898a14 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "gulp-replace": "^0.4.0",
     "gulp-rimraf": "^0.1.0",
     "gulp-stylus": "^1.3.0",
+    "gulp-uglify": "^1.0.1",
     "gulp-vulcanize": "^1.0.0",
     "gulp-watch": "^0.6.9",
     "jshint-stylish": "^0.4.0",