diff --git a/tooling/generators/pipe/index.js b/tooling/generators/pipe/index.js
index a5823bd4a5..7f4765c480 100644
--- a/tooling/generators/pipe/index.js
+++ b/tooling/generators/pipe/index.js
@@ -1,27 +1,30 @@
-var fs = require('fs'),
-    Generator = module.exports,
-    Generate = require('../../generate'),
-    path = require('path'),
-    Q = require('q');
-/*
-    @options
-      name: Page name
-      appDirectory: App directory of where to save file
-*/
-Generator.run = function run(options) {
-  Generate.createScaffoldDirectories({appDirectory: options.appDirectory, componentDirectory: 'pipes', fileName: options.fileName});
 
-  options.rootDirectory = options.rootDirectory || path.join('app', 'pipes');
-  var savePath = path.join(options.appDirectory, options.rootDirectory, options.fileName);
+var path = require('path'),
+    fs = require('fs'),
+    shell = require('shelljs'),
+    Generator = require('../../generator');
 
-  var templates = Generate.loadGeneratorTemplates(__dirname);
+module.exports = PipeGenerator;
+
+function PipeGenerator(options) {
+  Generator.call(this, options);
+  this.directory = path.join('app', 'pipes');
+}
+
+PipeGenerator.prototype = Object.create(Generator.prototype);
+
+PipeGenerator.prototype.makeDirectories = function(){
+  shell.mkdir('-p', path.join(this.appDirectory, this.directory));
+}
+
+PipeGenerator.prototype.renderTemplates = function renderTemplates() {
+  var templates = this.loadTemplates();
 
   templates.forEach(function(template) {
-    options.templatePath = template.file;
-    var renderedTemplate = Generate.renderTemplateFromFile(options);
-    var saveFilePath = path.join(savePath, [options.fileName, template.type].join(''));
-    // console.log('renderedTemplate', renderedTemplate, 'saving to', saveFilePath);
-    console.log('√ Create'.blue, path.relative(options.appDirectory, saveFilePath));
-    fs.writeFileSync(saveFilePath, renderedTemplate);
-  });
-};
+    var renderedTemplate = this.renderTemplate(template);
+    var renderedTemplateDest = path.join(this.appDirectory, this.directory, this.name + template.extension);
+    console.log('√ Create'.blue, path.relative(this.appDirectory, renderedTemplateDest));
+    fs.writeFileSync(renderedTemplateDest, renderedTemplate);
+  }, this);
+}
+
diff --git a/tooling/generators/pipe/pipe.tmpl.js b/tooling/generators/pipe/pipe.tmpl.js
index 6e3ab507dc..550696ea47 100644
--- a/tooling/generators/pipe/pipe.tmpl.js
+++ b/tooling/generators/pipe/pipe.tmpl.js
@@ -1,11 +1,21 @@
-import {Injectable, Pipe} from 'angular2/angular2';
+import {Injectable, Pipe} from 'angular2/core';
 
+/*
+  Generated class for the <%= jsClassName %> pipe.
+
+  See https://angular.io/docs/ts/latest/guide/pipes.html for more info on
+  Angular 2 Pipes.
+*/
 @Pipe({
   name: '<%= fileName %>'
 })
 @Injectable()
-class <%= jsClassName %> {
-  transform(v, args) { 
-    return v.toLowerCase(); 
+export class <%= jsClassName %> {
+  /*
+    Takes a value and makes it lowercase.
+   */
+  transform(value, args) {
+    value = value + ''; // make sure it's a string
+    return value.toLowerCase();
   }
 }