diff --git a/tooling/generate.js b/tooling/generate.js
index 238af3d939..82ce487028 100644
--- a/tooling/generate.js
+++ b/tooling/generate.js
@@ -30,12 +30,21 @@ Generate.generate = function generate(options) {
     Generate.log = options.log;
   }
 
+  if (options.inquirer) {
+    Generate.inquirer = options.inquirer;
+  }
+
+  if (options.q) {
+    Generate.q = options.q;
+  }
+
   if (!options.generatorName) {
     options.generatorName = 'page';
   }
 
   var generateOptions = { 
     appDirectory: options.appDirectory,
+    inquirer: options.inquirer,
     fileAndClassName: Generate.fileAndClassName(options.name),
     javascriptClassName: Generate.javascriptClassName(options.name),
     name: options.name
diff --git a/tooling/generators/page-tabs/index.js b/tooling/generators/page-tabs/index.js
index 3cfee84735..04092f4548 100644
--- a/tooling/generators/page-tabs/index.js
+++ b/tooling/generators/page-tabs/index.js
@@ -1,6 +1,102 @@
-var Generator = module.exports,
-    Generate = require('../../generate');
+var fs = require('fs'),
+    Generator = module.exports,
+    Generate = require('../../generate'),
+    path = require('path');
+
+Generator.validate = function(input) {
+  // console.log(typeof parseInt(input));
+  if (isNaN(parseInt(input))) {
+    // Pass the return value in the done callback
+    return 'You need to provide a number';
+  }
+  return true;
+};
+
+Generator.numberNames = ['first', 'second', 'third', 'fourth', 'fifth'];
+
+Generator.promptForTabCount = function promptForTabCount() {
+  var q = Generate.q.defer();
+
+  Generate.inquirer.prompt({choices: ['1', '2', '3', '4', '5'], message: 'How many tabs will you have?', name: 'count', type: 'list', validate: Generator.validate}, function(result) {
+    q.resolve(result.count);
+  });
+
+  return q.promise;
+};
+
+Generator.promptForTabName = function promptForTabName(tabIndex, options) {
+  var q = Generate.q.defer();
+
+  Generate.inquirer.prompt({message: 'Enter the ' + Generator.numberNames[tabIndex] + ' tab name:', name: 'name', type: 'input'}, function(nameResult) {
+    Generator.tabs.push({ appDirectory: options.appDirectory, fileAndClassName: Generate.fileAndClassName(nameResult.name), javascriptClassName: Generate.javascriptClassName(nameResult.name), name: nameResult.name });
+    q.resolve();
+  });
+
+  return q.promise;
+}
 
 Generator.run = function run(options) {
-  console.log('got options!', options);
+  // console.log('got options!', options);
+
+  // Generator.q = Generate.q;
+  //Need to query user for tabs:
+  options.rootDirectory = options.rootDirectory || path.join('www', 'app');
+  var savePath = path.join(options.appDirectory, options.rootDirectory, options.fileAndClassName);
+
+  Generator.tabs = [];
+
+  return Generator.promptForTabCount()
+  .then(function(count) {
+    console.log('count', count);
+    var promise = Generate.q();
+    for(var i = 0, j = parseInt(count); i < j; i++) {
+      (function(index) {
+        promise = promise.then(function() {
+          return Generator.promptForTabName(index, options);
+        });
+      })(i);//avoid closure loop var
+    }
+
+    return promise;
+    // .fin(function(result) {
+      // console.log('All done', result);
+      // console.log('Using tabs:', Generator.tabs);
+    // });
+  })
+  .then(function() { 
+    var templates = Generate.loadGeneratorTemplates(__dirname);
+      
+    //Generate the tabs container page templates
+    templates.forEach(function(template) {
+      var templatePath = path.join(__dirname, template.file);
+      options.templatePath = templatePath;
+      options.tabs = Generator.tabs;
+      var renderedTemplate = Generate.renderTemplateFromFile(options);
+      var saveFilePath = path.join(savePath, [options.fileAndClassName, template.type].join(''));
+      // console.log('renderedTemplate', renderedTemplate, 'saving to', saveFilePath);
+      console.log('√ Create'.blue, path.relative(options.appDirectory, saveFilePath));
+      fs.writeFileSync(saveFilePath, renderedTemplate);
+    });
+
+    //Now render the individual tab pages
+    Generator.tabs.forEach(function(tab) {
+      Generate.createScaffoldDirectories({appDirectory: tab.appDirectory, fileAndClassName: tab.fileAndClassName});
+      var pageGenerator = require('../page');
+      pageGenerator.run(tab);
+    });
+  })
+  .catch(function(ex) {
+    console.log('Something went wrong', ex);
+    console.log(ex.stack);
+    throw ex;
+  })
+  .fin(function() {
+    console.log('√ Done'.green);
+  });
+
+  // var tabsData = [];
+  // tabs.forEach(function(tab) {
+  //   var tabObj = { name: tab, javascriptClassName: Generate.javascriptClassName(tab)};
+  //   tabsData.push(tabObj);
+  // });
 };
diff --git a/tooling/generators/page-tabs/tabs.tmpl.js b/tooling/generators/page-tabs/tabs.tmpl.js
index a18aee60b3..30f1b3d829 100644
--- a/tooling/generators/page-tabs/tabs.tmpl.js
+++ b/tooling/generators/page-tabs/tabs.tmpl.js
@@ -1,11 +1,11 @@
 import {NavController, Page} from 'ionic/ionic';
 
 <% _.forEach(tabs, function(tab) { %>
-import {<%= tab.javascriptClassName %>} from '../<%= tab.filename %>/<%= tab.filename %>';
+import {<%= tab.javascriptClassName %>} from '../<%= tab.fileAndClassName %>/<%= tab.fileAndClassName %>';
 <% }); %>
 
 @Page({
-  templateUrl: 'app/<%= filename %>/<%= filename %>.html'
+  templateUrl: 'app/<%= fileAndClassName %>/<%= fileAndClassName %>.html'
 })
 export class <%= javascriptClassName %> {
   constructor(nav: NavController) {
diff --git a/tooling/generators/page/index.js b/tooling/generators/page/index.js
index db9fe34c87..bb393fca36 100644
--- a/tooling/generators/page/index.js
+++ b/tooling/generators/page/index.js
@@ -17,6 +17,7 @@ var fs = require('fs'),
       appDirectory: App directory of where to save file
 */
 Generator.run = function run(options) {
+
   options.rootDirectory = options.rootDirectory || path.join('www', 'app');
   var savePath = path.join(options.appDirectory, options.rootDirectory, options.fileAndClassName);
 
@@ -28,7 +29,7 @@ Generator.run = function run(options) {
     var renderedTemplate = Generate.renderTemplateFromFile(options);
     var saveFilePath = path.join(savePath, [options.fileAndClassName, template.type].join(''));
     // console.log('renderedTemplate', renderedTemplate, 'saving to', saveFilePath);
-    console.log('\n√ Create'.blue, path.relative(options.appDirectory, saveFilePath));
+    console.log('√ Create'.blue, path.relative(options.appDirectory, saveFilePath));
     fs.writeFileSync(saveFilePath, renderedTemplate);
   });
 };