diff --git a/ui (gen4)/features/cli.js b/ui (gen4)/features/cli.js
new file mode 100755
index 00000000..b0faf1af
--- /dev/null
+++ b/ui (gen4)/features/cli.js	
@@ -0,0 +1,67 @@
+/**********************************************************************
+* 
+*
+*
+**********************************************************************/
+
+define(function(require){ var module = {}
+
+//var DEBUG = DEBUG != null ? DEBUG : true
+
+var actions = require('lib/actions')
+var features = require('lib/features')
+
+var data = require('data')
+var images = require('images')
+var ribbons = require('ribbons')
+
+var core = require('features/core')
+var base = require('features/base')
+
+
+
+/*********************************************************************/
+
+var CLI = 
+module.CLI = core.ImageGridFeatures.Feature({
+	title: '',
+	doc: '',
+
+	tag: 'commandline',
+	depends: ['base'],
+
+	isApplicable: function(){ 
+		return this.runtime == 'node' || this.runtime == 'nw' 
+	},
+
+	handlers: [
+		['start',
+			function(){
+				if(this.runtime == 'nw'){
+					var argv = requirejs('nw.gui').App.argv
+				} else if(this.runtime == 'node'){
+					var argv = process.argv
+				}
+
+				// XXX for some reason this always contains --help in nw...
+				console.log('>>>>', argv)
+
+				var cli = requirejs('commander')
+
+				cli
+					.version('0.0.1')
+					.usage('COMMAND OPTION ..')
+					.command('index PATH', 'build and index of path')
+					.parse(argv)
+			}]
+	],
+})
+
+
+
+
+
+
+/**********************************************************************
+* vim:set ts=4 sw=4 :                                                */
+return module })
diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js
index 9e562609..4cd72c4a 100755
--- a/ui (gen4)/features/meta.js	
+++ b/ui (gen4)/features/meta.js	
@@ -28,6 +28,7 @@ var core = require('features/core')
 core.ImageGridFeatures.Feature('viewer-testing', [
 	'lifecycle',
 	'base-full',
+	'commandline',
 	'ui',
 
 	'ui-ribbons-placement',
diff --git a/ui (gen4)/ig.js b/ui (gen4)/ig.js
new file mode 100644
index 00000000..d891e00b
--- /dev/null
+++ b/ui (gen4)/ig.js	
@@ -0,0 +1,43 @@
+/**********************************************************************
+* 
+*
+*
+**********************************************************************/
+
+//var DEBUG = DEBUG != null ? DEBUG : true
+
+
+//var ui = require('./ui')
+
+var requirejs = require('requirejs')
+requirejs.config({
+	nodeRequire: require,
+	//baseUrl: __dirname,
+
+	// XXX this does not work on direct filesystem access...
+	//urlArgs: 'bust='+Date.now(),
+})
+
+// XXX load only the actualy used here modules...
+var actions = requirejs('lib/actions')
+var data = requirejs('data')
+var ribbons = requirejs('ribbons')
+
+
+// XXX 
+var testing = requirejs('testing')
+
+
+var client = requirejs('client')
+
+var viewer = requirejs('viewer')
+
+
+
+/*********************************************************************/
+
+
+
+
+/**********************************************************************
+* vim:set ts=4 sw=4 :                                                */
diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json
index fd2f0ff6..7fe3daa4 100755
--- a/ui (gen4)/package.json	
+++ b/ui (gen4)/package.json	
@@ -17,9 +17,10 @@
     "page-cache": true
   },
   "dependencies": {
+    "commander": "^2.9.0",
     "flickrapi": "^0.3.28",
-    "fs-walk": "0.0.1",
     "fs-extra": "*",
+    "fs-walk": "0.0.1",
     "glob": "^4.0.6",
     "guarantee-events": "^1.0.0",
     "promise": "^6.0.1",
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index 25ab4551..e76709dc 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -39,6 +39,7 @@ var experimental = require('features/experimental')
 
 if(window.nodejs != null){
 	var filesystem = require('features/filesystem')
+	var cli = require('features/cli')
 }