diff --git a/test.js b/test.js
index eb31906..d4fa786 100644
--- a/test.js
+++ b/test.js
@@ -15,18 +15,180 @@ var test = require('ig-test')
 var argv = require('./argv')
 
 
-var bare = module.bare = require('./examples/bare').parser
-var options = module.options = require('./examples/options').parser
-var lang = module.lang = require('./examples/lang').parser
+//---------------------------------------------------------------------
+
+argv.Parser.typeHandlers.error = function(){
+	throw new argv.ParserTypeError('type error') }
 
 
 
 //---------------------------------------------------------------------
 
+var setups = 
 test.Setups({
-	bare: require('./examples/bare').parser,
-	options: require('./examples/options').parser,
-	lang: require('./examples/lang').parser,
+	bare: function(){
+		return require('./examples/bare').parser },
+	options: function(){
+		return require('./examples/options').parser },
+	lang: function(){
+		return require('./examples/lang').parser },
+
+	// NOTE: this will also load .bare, .options and .lang
+	basic: function(assert){
+		return argv.Parser({
+			// disable exit on error...
+			handleErrorExit: false,
+
+			'@help': '-help',
+
+			'-verbose': function(){
+				console.log('>>> VERBOSE:', ...arguments)
+				return 'verbose' },
+
+			'-c': '@command',
+			'@cmd': '@command',
+			'@command': {
+				priority: -50,
+				handler: function(){
+					console.log('>>> COMMAND:', ...arguments)
+					return 'command' },
+			},
+
+			'-r': '-required',
+			'-required': {
+				doc: 'Required option',
+				required: true,
+			},
+
+			'-prefix': {
+				doc: 'prefix test',
+				handler: function(opts, key, value){
+					console.log('PREFIX:', key[0]) }, },
+
+			'-value': {
+				doc: 'Value option',
+				arg: 'VALUE | valueValue',
+				default: 333,
+			},
+
+			'-c': '-collection',
+			'-collection': {
+				doc: 'collect ELEM',
+				arg: 'ELEM | elems',
+				collect: 'set',
+			},
+			'-t': '-toggle',
+			'-toggle': {
+				doc: 'toggle value',
+				arg: '| toggle_value',
+				collect: 'toggle',
+			},
+			'-s': '-string',
+			'-string': {
+				doc: 'collect tab-separated strings',
+				arg: 'STR | str',
+				collect: 'string|\t',
+			},
+			//'-a': '-ab',
+			'-sh': {
+				doc: 'short option', },
+
+			'-env': {
+				doc: 'env value',
+				arg: 'VALUE | env_value',
+				env: 'VALUE',
+
+				//default: 5,
+				handler: function(args, key, value){ console.log('GOT ENV:', value) },
+			},
+
+			'-type-error': {
+				doc: 'throw a type error',
+				type: 'error', 
+			},
+			'-error': {
+				doc: 'throw an error',
+				handler: function(){
+					throw argv.ParserError('error: $ARG') }},
+			'-passive-error': {
+				doc: 'throw an error',
+				handler: function(){
+					return argv.ParserError('error') }},
+
+
+			'-test': argv.Parser({
+				env: 'TEST',
+				arg: 'TEST',
+				default: function(){
+					return this['-value'].default },
+			}).then(function(){
+				console.log('TEST', ...arguments) }),
+
+			'-i': '-int',
+			'-int': {
+				arg: 'INT|int',
+				type: 'int',
+				valueRequired: true,
+			},
+
+			'@nested': argv.Parser({
+				doc: 'nested parser.',
+
+				'@nested': argv.Parser({
+					doc: 'nested nested parser.',
+				}).then(function(){
+					console.log('NESTED NESTED DONE', ...arguments)}),
+			}).then(function(){
+				console.log('NESTED DONE', ...arguments) }),
+
+			'-n': {
+				doc: 'proxy to nested',
+				handler: function(){
+					return this.handle('nested', ...arguments) }, },
+
+			'-\\*': {
+				handler: function(){
+					console.log('-\\*:', ...arguments) } },
+
+			//'@*': undefined,
+
+			// these aliases will not get shown...
+
+			// dead-end alias...
+			'-d': '-dead-end',
+
+			// alias loops...
+			// XXX should we detect and complain about these???
+			// 		...maybe in a test function??
+			'-z': '-z',
+
+			'-x': '-y',
+			'-y': '-x',
+
+			'-k': '-l',
+			'-l': '-m',
+			'-m': '-k',
+
+
+			'@bare': setups.bare(assert),
+			'@opts': setups.options(assert),
+			'@lang': setups.lang(assert),
+
+
+			// collision test...
+			// NOTE: values of these will shadow the API...
+			'@options': {},
+			'-handler': {},
+		})
+		//.print(function(...args){
+		//	console.log('----\n', ...args)
+		//	return argv.STOP })
+		.then(function(){
+			console.log('DONE', ...arguments) })
+		.stop(function(){
+			console.log('STOP', ...arguments) })
+		.error(function(){
+			console.log('ERROR', ...arguments) }) }
 })
 
 test.Modifiers({
@@ -35,179 +197,10 @@ test.Modifiers({
 test.Tests({
 })
 
-
 test.Cases({
 })
 
 
-
-//---------------------------------------------------------------------
-
-
-argv.Parser.typeHandlers.error = function(){
-	throw new argv.ParserTypeError('type error') }
-
-
-var p = 
-module.p =
-argv.Parser({
-		// disable exit on error...
-		handleErrorExit: false,
-
-		'@help': '-help',
-
-		'-verbose': function(){
-			console.log('>>> VERBOSE:', ...arguments)
-			return 'verbose' },
-
-		'-c': '@command',
-		'@cmd': '@command',
-		'@command': {
-			priority: -50,
-			handler: function(){
-				console.log('>>> COMMAND:', ...arguments)
-				return 'command' },
-		},
-
-		'-r': '-required',
-		'-required': {
-			doc: 'Required option',
-			required: true,
-		},
-
-		'-prefix': {
-			doc: 'prefix test',
-			handler: function(opts, key, value){
-				console.log('PREFIX:', key[0]) }, },
-
-		'-value': {
-			doc: 'Value option',
-			arg: 'VALUE | valueValue',
-			default: 333,
-		},
-
-		'-c': '-collection',
-		'-collection': {
-			doc: 'collect ELEM',
-			arg: 'ELEM | elems',
-			collect: 'set',
-		},
-		'-t': '-toggle',
-		'-toggle': {
-			doc: 'toggle value',
-			arg: '| toggle_value',
-			collect: 'toggle',
-		},
-		'-s': '-string',
-		'-string': {
-			doc: 'collect tab-separated strings',
-			arg: 'STR | str',
-			collect: 'string|\t',
-		},
-		//'-a': '-ab',
-		'-sh': {
-			doc: 'short option', },
-
-		'-env': {
-			doc: 'env value',
-			arg: 'VALUE | env_value',
-			env: 'VALUE',
-
-			//default: 5,
-			handler: function(args, key, value){ console.log('GOT ENV:', value) },
-		},
-
-		'-type-error': {
-			doc: 'throw a type error',
-			type: 'error', 
-		},
-		'-error': {
-			doc: 'throw an error',
-			handler: function(){
-				throw argv.ParserError('error: $ARG') }},
-		'-passive-error': {
-			doc: 'throw an error',
-			handler: function(){
-				return argv.ParserError('error') }},
-
-
-		'-test': argv.Parser({
-			env: 'TEST',
-			arg: 'TEST',
-			default: function(){
-				return this['-value'].default },
-		}).then(function(){
-			console.log('TEST', ...arguments) }),
-
-		'-i': '-int',
-		'-int': {
-			arg: 'INT|int',
-			type: 'int',
-			valueRequired: true,
-		},
-
-		'@nested': argv.Parser({
-			doc: 'nested parser.',
-
-			'@nested': argv.Parser({
-				doc: 'nested nested parser.',
-			}).then(function(){
-				console.log('NESTED NESTED DONE', ...arguments)}),
-		}).then(function(){
-			console.log('NESTED DONE', ...arguments) }),
-
-		'-n': {
-			doc: 'proxy to nested',
-			handler: function(){
-				return this.handle('nested', ...arguments) }, },
-
-		'-\\*': {
-			handler: function(){
-				console.log('-\\*:', ...arguments) } },
-
-		//'@*': undefined,
-
-		// these aliases will not get shown...
-
-		// dead-end alias...
-		'-d': '-dead-end',
-
-		// alias loops...
-		// XXX should we detect and complain about these???
-		// 		...maybe in a test function??
-		'-z': '-z',
-
-		'-x': '-y',
-		'-y': '-x',
-
-		'-k': '-l',
-		'-l': '-m',
-		'-m': '-k',
-
-
-		'@bare': bare,
-		'@opts': options,
-
-		'@lang': lang,
-
-
-		// collision test...
-		// NOTE: values of these will shadow the API...
-		'@options': {},
-		'-handler': {},
-	})
-	//.print(function(...args){
-	//	console.log('----\n', ...args)
-	//	return argv.STOP })
-	.then(function(){
-		console.log('DONE', ...arguments) })
-	.stop(function(){
-		console.log('STOP', ...arguments) })
-	.error(function(){
-		console.log('ERROR', ...arguments) })
-
-
-
 /*
 console.log('  ->', p(['test', '--verbose', 'a', 'b', 'c']))
 
@@ -224,10 +217,12 @@ p(['test', 'nested', '-h'])
 p(['test', '-h'])
 //*/
 
+
+//---------------------------------------------------------------------
+
 typeof(__filename) != 'undefined'
 	&& __filename == (require.main || {}).filename
-	&& console.log(p())
-	//&& console.log(lang())
+	&& console.log(setups.basic()())
 	//&& test.run()