diff --git a/pwiki.js b/pwiki.js
new file mode 100755
index 0000000..e8dd9a1
--- /dev/null
+++ b/pwiki.js
@@ -0,0 +1,435 @@
+/**********************************************************************
+* 
+*
+*
+**********************************************************************/
+(typeof(define)[0]=='u'?function(f){module.exports=f(require)}:define)(
+function(require){ var module={} // makes module AMD/node compatible...
+/*********************************************************************/
+
+var object = require('lib/object')
+var actions = require('lib/actions')
+var features = require('lib/features')
+
+
+
+/*********************************************************************/
+
+var path2lst = function(path){ 
+	return (path instanceof Array ?  path : path.split(/[\\\/]+/g))
+		// handle '..' (lookahead) and trim path elements...
+		// NOTE: this will not touch the leading '.' or '..'
+		.map(function(p, i, l){
+			return (i > 0 && (p.trim() == '..' || p.trim() == '.')
+					|| (l[i+1] || '').trim() == '..') ? 
+				null 
+				: p.trim() })
+		// cleanup and clear '.'...
+		.filter(function(p){ 
+			return p != null && p != '' })}
+
+var normalizePath = function(path){ return path2lst(path).join('/') }
+
+
+
+
+/*********************************************************************/
+
+// base pWiki object...
+var pWiki = object.makeConstructor('pWiki', actions.MetaActions)
+
+// pWiki featureset...
+var pWikiFeatures = new features.FeatureSet() 
+
+// base instance constructor...
+pWikiFeatures.__actions__ = 
+	function(){ return actions.Actions(pWiki()) }
+
+
+
+/*********************************************************************/
+
+// XXX should this be art of the main API or a separate entity???
+// XXX should we combine page and wiki api???
+// 		- pWikiData is wiki api
+// 		- pWiki is page api
+var pWikiData = {
+	__data: null,
+
+	// get a list of matching paths...
+	// XXX sort API???
+	match: function(path){
+		// path patterns -- "*"
+		if(path.indexOf('*') >= 0){
+			return [ path ]
+		}
+
+		// get the tail...
+		var tail = path.split(/\*/g).pop()
+		tail = tail == path ? '' : tail
+
+		var pattern = RegExp('^'
+			+normalizePath(path)
+				// quote regexp chars...
+				.replace(/([\.\\\/\(\)\[\]\$\+\-\{\}\@\^\&\?\<\>])/g, '\\$1')
+
+				// convert '*' and '**' to regexp...
+				.replace(/\*\*/g, '.*')
+				.replace(/^\*|([^.])\*/g, '$1[^\\/]*')
+			+'$')
+
+		var data = this.__data || {}
+		return Object.keys(data)
+				// XXX is this correct???
+				.concat(Object.keys(data.__proto__)
+					// do not repeat overloaded stuff...
+					.filter(function(e){ return !data.hasOwnProperty(e) }))
+			.map(function(p){ return tail != '' ? 
+				normalizePath(p +'/'+ tail) 
+				: p })
+			.filter(function(p){ return pattern.test(p) })
+	},
+	// get/set data at path...
+	// XXX should this overwrite or expand???
+	// XXX should from be pattern compatible???
+	data: function(path, value){
+		if(value == null){
+			return this.__data ? this.__data[path] : null
+
+		} else {
+			this.__data = this.__data || {}
+			this.__data[path] = value
+			return this
+		}
+	},
+	// move data from path to path...
+	// XXX should from be pattern compatible???
+	move: function(from, to){
+		if(this.__data == null){
+			return
+		}
+		var d = this.__data[from]
+		this.clear(from)
+		this.__data[to] = d
+		return this
+	},
+	// clear data at path...
+	clear: function(path){
+		var that = this
+		this.match(path).forEach(function(p){
+			delete that.__data[p]
+		})
+		return this
+	},
+}
+
+
+
+/*********************************************************************/
+
+var pWikiPageActions = actions.Actions({
+	config: {
+		'home-page': 'WikiHome',
+		'default-page': 'EmptyPage',
+
+		'system-path': 'System',
+
+		'acquesition-order': [
+			'Templates',
+		],
+		'post-acquesition-order': [],
+	},
+
+	// pWikiData...
+	wiki: null,
+
+	get length(){
+		return this.wiki.match(this.location().path).length },
+
+	resolve: ['Resolve relative path and expand path variables',
+		function(path){
+			path = normalizePath(path)
+
+			// path variables...
+			// XXX make this more modular...
+			path
+				.replace(/\$NOW|\$\{NOW\}/g, Date.now())
+				.replace(/\$TITLE|\$\{TITLE\}/g, this.title())
+				.replace(/\$BASE|\$\{BASE\}/g, this.base())
+				.replace(/\$INDEX|\$\{INDEX\}/g, this.at())
+
+			// relative paths -- "." and ".."
+			if(path.indexOf('.') >= 0){
+				path = 
+					// '.' or './*'
+					path == '.' || /^\.\//.test(path) ? 
+						path.replace(/^\./, this.base)
+					// '..' or '../*'
+					: path == '..' || /^\.\.\//.test(path) ? 
+						path.replace(/^\.\./, this.base)
+					: path
+			}
+
+			return path
+		}],
+
+	location: ['Get or set location',
+		function(value){
+			if(value == null){
+				return
+			}
+
+			// XXX should we set/return a default empty value here???
+			this.__location = this.__location || {}
+
+			// get location...
+			if(arguments.length == 0){
+				return this.__location || this.config['home-page']
+			}
+
+			// set location index...
+			if(typeof(value) == typeof(123)){
+				this.__location.at = value
+
+			// set location path...
+			} else if(typeof(value) == typeof('str')){
+				this.__location.path = this.resolve(value)
+				this.__location.at = 0
+
+			// object...
+			} else {
+				this.__location = value
+			}
+		}],
+	path: ['Page/Get or set path', 
+		function(value){
+			// get explcit path from location (acounting for 'at')...
+			if(arguments.length == 0){
+				var location = this.location()
+				return this.wiki.match(location.path)[location.at]
+
+			// move page to path...
+			} else if(value != null) {
+				this.wiki.move(this.path(), this.resolve(value))
+			}
+		}],
+	title: ['Page/Get or set title',
+		function(value){
+			if(arguments.length == 0){
+				return path2list(this.path()).pop()
+
+			} else if(value != null){
+				this.path(this.base() +'/'+ value)
+			}
+		}]
+	base: ['Page/Get or set directory',
+		function(base){
+			if(arguments.length == 0){
+				return path2list(this.path()).slice(0, -1).join('/')
+
+			} else if(base != null){
+				this.path(base +'/'+ this.title())
+			}
+		}]
+
+	acquire: ['',
+		function(path, no_default){
+			var that = this
+
+			// handle paths and relative paths...
+			var p = this.get(path)
+			var title = p.title()
+			path = path2lst(p.base())
+
+			var acquire_from = this.config['acquesition-order'] || []
+			var post_acquire_from = this.config['post-acquesition-order'] || []
+
+			var _get = function(path, title, lst){
+				lst = (lst == null || lst.length == 0) ? [''] : lst
+				for(var i=0; i < lst.length; i++){
+					var p = path.concat([lst[i], title])
+					if(that.exists(p)){
+						p = normalizePath(p)
+						return that.wiki.data(p) && p
+					}
+				}
+			}
+
+			while(true){
+				// get title from path...
+				var p = _get(path, title)
+					// get title from special paths in path...
+					|| _get(path, title, acquire_from)
+
+				if(p != null){
+					return p
+				}
+
+				if(path.length == 0){
+					break
+				}
+
+				path.pop()
+			}
+
+			// default paths...
+			var p = _get(path, title, post_acquire_from)
+				// system path...
+				|| this.config['system-path']
+					&& _get([this.config['system-path']], title)
+
+			// NOTE: this may be null...
+			return p 
+				|| ((!no_default && title != this.config['default-page']) ? 
+					this.acquire('./'+this.config['default-page']) 
+					: null)
+		}],
+
+	exists: ['Page/Check if path explicitly exists.', 
+		function(path){
+			path = path || this.path()
+			var location = this.location()
+			return this.wiki.match(location.path)[location.at] !== undefined
+		}],
+	data: ['Page/Get or set data', 
+		function(value){
+			// get -> acquire page and get it's data...
+			if(arguments.length == 0){
+				return this.wiki.data(this.acquire())
+
+			// set -> get explicit path and set data to it...
+			} else if(value != null) {
+				this.wiki.data(this.path(), value || '')
+			}
+		}],
+	clear: ['Clear page', 
+		function(){ this.wiki.clear(this.path()) }],
+
+	// NOTE: a clone references the same data, no copying is done.
+	clone: ['Get page clone (new reference)', 
+		function(){
+			//var o = (new this.constructor())
+			var o = Object.create(this)
+				.location(this.location())
+
+			o.__parent_context = this
+			if(this.__order){
+				o.__order = this.__order.slice()
+			}
+
+			return o
+		}],
+	end: ['Get paren context of clone', 
+		function(){ return this.__parent_context || this }],
+	// XXX should this return false on empty path???
+	copy: ['Copy page to path', 
+		function(path){
+			return path != null 
+				&& this
+					.get(path)
+					// NOTE: this is here mainly to maintain the context stack...
+					.clone()
+						.data(this.data()) }],
+
+	get: ['Get page by path', 
+		function(path){
+			return this
+				.clone()
+				.location(path) }],
+
+	at: ['Get index or page at given index', 
+		function(n){
+			// get current index...
+			if(n == null){
+				return this.location().at || 0
+			}
+
+			// get page at index...
+
+			var l = this.length
+
+			// out of bounds...
+			if(n >= l || n < -l){
+				return null
+			}
+
+			var res = this.clone()
+
+			n = n < 0 ? l - n : n
+			// XXX do we min/max n???
+			n = Math.max(n, 0)
+			n = Math.min(l-1, n)
+
+			res.location(n)
+
+			return res
+		}],
+	prev: ['Get previous page', 
+		function(){
+			var i = this.at() - 1
+			// NOTE: need to guard against overflows...
+			return i >= 0 ? this.at(i) : null }],
+	next: ['Get next page', 
+		function(){ return this.at(this.at() + 1) }],
+
+	map: ['', 
+		function(func){
+			var res = []
+			for(var i=0; i < this.length; i++){
+				var page = this.at(i)
+				res.push(func.call(page, page, i))
+			}
+			return res
+		}],
+	// XXX add path (str) filters...
+	filter: ['', 
+		function(func){
+			var res = []
+			for(var i=0; i < this.length; i++){
+				var page = this.at(i)
+				func.call(page, page, i) && res.push(page)
+			}
+			return res
+		}],
+	each: ['', 
+		function(func){ this.map(func) }],
+	// XXX reduce???
+
+	sort: ['', function(){ }],
+	reverse: ['', function(){ }],
+	// XXX not sure if this is the right way to go...
+	update: ['', function(){ }],
+})
+
+
+var pWikiPage = pWikiFeatures.Featre({
+	title: '',
+	tag: 'page',
+
+	actions: pWikiPageActions,
+})
+
+
+
+
+var pWikiDictStore = pWikiFeatures.Featre({
+	title: '',
+	tag: 'dict-store',
+})
+var pWikiLocalStorageStore = pWikiFeatures.Featre({
+	title: '',
+	tag: 'localstorage-store',
+
+	depends: [
+		'dict-store',
+	],
+})
+var pWikiPouchDBStore = pWikiFeatures.Featre({
+	title: '',
+	tag: 'pouchdb-store',
+})
+
+
+
+/**********************************************************************
+* vim:set ts=4 sw=4 :                               */ return module })
diff --git a/wiki.js b/wiki.js
index 255336f..382583a 100755
--- a/wiki.js
+++ b/wiki.js
@@ -1165,6 +1165,11 @@ var Wiki = {
 		//o.__location_at = this.__location_at
 		// XXX
 		o.__parent = this
+
+		if(this.__order){
+			o.__order = this.__order.slice()
+		}
+
 		return o
 	},
 	end: function(){
@@ -1463,7 +1468,7 @@ var Wiki = {
 	// iteration...
 	get length(){
 		return (this.__order || this.resolveStarPath(this.location)).length },
-	// get/srt postion in list of pages...
+	// get/set postion in list of pages...
 	// XXX do we need to min/max normalize n??
 	at: function(n){
 		// get position...
@@ -1479,9 +1484,6 @@ var Wiki = {
 		}
 
 		var res = this.clone()
-		if(this.__order){
-			res.__order = this.__order.slice()
-		}
 
 		n = n < 0 ? l - n : n
 		// XXX do we min/max n???