diff --git a/index.html b/index.html
index 651c699..cfd6582 100755
--- a/index.html
+++ b/index.html
@@ -53,10 +53,7 @@ var activateWikiWords = text =>
 	text
 		// set new...
 		.replace(
-			RegExp('('+[
-				'[A-Z][a-z0-9]+[A-Z\/][a-zA-Z0-9\/]*',
-				'\\[[^\\]]+\\]',
-				].join('|') +')', 'g'),
+			Wiki.__wiki_link__,
 			'<a class="WikiWord" href="#" onclick="go($(this).text().replace(/^\\[|\\]$/g, \'\'))">$1</a>')
 
 
diff --git a/wiki.js b/wiki.js
index b612afe..5d3d9a2 100755
--- a/wiki.js
+++ b/wiki.js
@@ -28,36 +28,69 @@ var data = {
 }
 
 
+
+/*********************************************************************/
+
 var path2lst = path => 
-	(path instanceof Array ? 
-	 		path 
-			: path.split(/[\\\/]+/g))
-		.map(p => p.trim())
+	(path instanceof Array ?  path : path.split(/[\\\/]+/g))
+		// handle '..' (lookahead) and trim path elements...
+		// NOTE: this will not touch the leading '.' or '..'
+		.map((p, i, l) => 
+			(i > 0 && (p.trim() == '..' || p.trim() == '.')
+					|| (l[i+1] || '').trim() == '..') ? 
+				null 
+				: p.trim())
+		// cleanup and clear '.'...
 		.filter(p => 
-			p != '' && p != '.')
+			p != null && p != '')
 
 var normalizePath = path => 
 	path2lst(path).join('/')
 
 
+
+/*********************************************************************/
+
 var Wiki = {
 	__wiki_data: data,
 
 	__home_page__: 'WikiHome',
 	__default_page__: 'EmptyPage',
 	__templates__: 'Templates',
+	//__redirect_template__: 'RedirectTemplate',
 
 	__wiki_link__: RegExp('('+[
-		'[A-Z][a-z0-9]+[A-Z\/][a-zA-Z0-9\/]*',
+		'(\\./|\\.\\./|[A-Z][a-z0-9]+[A-Z/])[a-zA-Z0-9/]*',
 		'\\[[^\\]]+\\]',
 	].join('|') +')', 'g'),
 
 
+	// Resolve '.' and '..' relative to current page...
+	//
+	// With the .path set to A/B/C, this will resolve the folowing to:
+	// 	'.'			-> 'A/B' 
+	// 	'..'		-> 'A'
+	// 	'./X'		-> 'A/B/X'
+	// 	'../X'		-> 'A/X'
+	//
+	resolveDotPath: function(path){
+		path = normalizePath(path)
+		// '.' or './*'
+		return path == '.' || /^\.\//.test(path) ? 
+				path.replace(/^\./, this.dir)
+			// '..' or '../*'
+			: path == '..' || /^\.\.\//.test(path) ? 
+				path.replace(/^\.\./, 
+					normalizePath(path2lst(this.dir).slice(0, -1)))
+			: path
+	},
+
+
 	// current location...
 	get location(){
 		return this.__location || this.__home_page__ },
 	set location(value){
-		this.__location = normalizePath(value) },
+		this.__location = this.resolveDotPath(value) },
 
 	// page path...
 	//
@@ -72,7 +105,7 @@ var Wiki = {
 	get path(){ 
 		return this.location },
 	set path(value){
-		value = normalizePath(value)
+		value = this.resolveDotPath(value)
 
 		var l = this.location
 
@@ -205,7 +238,7 @@ var Wiki = {
 	// 	- explicit path
 	// 	- .title in path
 	// 	- .title in templates
-	// 	- aquire default page (same order as above)
+	// 	- aquire empty page (same order as above)
 	//
 	get text(){
 		return (this.acquireData() || {}).text || '' },
@@ -231,11 +264,9 @@ var Wiki = {
 		return links
 	},
 
-	// XXX
+	// XXX list children/sub-pages...
 	get list(){
 	},
-	set list(value){
-	},
 
 
 	exists: function(path){